b7dd6f45c1
Resolves: bz#1479446 bz#1520882 bz#1579758 bz#1598407 bz#1599808 Resolves: bz#1603118 bz#1619357 bz#1622001 bz#1622308 bz#1631166 Resolves: bz#1631418 bz#1632563 bz#1634649 bz#1635071 bz#1635100 Resolves: bz#1635136 bz#1636291 bz#1638069 bz#1640347 bz#1642854 Resolves: bz#1643035 bz#1644120 bz#1644279 bz#1645916 bz#1647675 Signed-off-by: Milind Changire <mchangir@redhat.com>
67 lines
2.6 KiB
Diff
67 lines
2.6 KiB
Diff
From 23dda42f6fa9fe0e6def1b6b0cef8dfdd9a5dcb3 Mon Sep 17 00:00:00 2001
|
|
From: Milind Changire <mchangir@redhat.com>
|
|
Date: Mon, 5 Nov 2018 15:02:36 +0530
|
|
Subject: [PATCH 413/444] glusterfind: add logs to identify parsing phases
|
|
|
|
Add logs to idenitfy start and finish of changelog parsing phases.
|
|
|
|
mainline:
|
|
> fixes: bz#1632236
|
|
> Reviewed-on: https://review.gluster.org/c/glusterfs/+/21262
|
|
> Change-Id: Id250231f2af7829f887401d30ac98875ae1ae793
|
|
> Signed-off-by: Milind Changire <mchangir@redhat.com>
|
|
|
|
Change-Id: Id250231f2af7829f887401d30ac98875ae1ae793
|
|
BUG: 1631166
|
|
Signed-off-by: Milind Changire <mchangir@redhat.com>
|
|
Reviewed-on: https://code.engineering.redhat.com/gerrit/154905
|
|
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
---
|
|
tools/glusterfind/src/changelog.py | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/tools/glusterfind/src/changelog.py b/tools/glusterfind/src/changelog.py
|
|
index 2376af2..8354cc9 100644
|
|
--- a/tools/glusterfind/src/changelog.py
|
|
+++ b/tools/glusterfind/src/changelog.py
|
|
@@ -273,6 +273,7 @@ def get_changes(brick, hash_dir, log_file, start, end, args):
|
|
fail("%s: %s Historical Changelogs not available: %s" %
|
|
(args.node, brick, e), logger=logger)
|
|
|
|
+ logger.info("[1/4] Starting changelog parsing ...")
|
|
try:
|
|
# scan followed by getchanges till scan returns zero.
|
|
# history_scan() is blocking call, till it gets the number
|
|
@@ -301,18 +302,27 @@ def get_changes(brick, hash_dir, log_file, start, end, args):
|
|
fail("%s Error during Changelog Crawl: %s" % (brick, e),
|
|
logger=logger)
|
|
|
|
+ logger.info("[1/4] Finished changelog parsing.")
|
|
+
|
|
# Convert all pgfid available from Changelogs
|
|
+ logger.info("[2/4] Starting 'pgfid to path' conversions ...")
|
|
pgfid_to_path(brick, changelog_data)
|
|
changelog_data.commit()
|
|
+ logger.info("[2/4] Finished 'pgfid to path' conversions.")
|
|
|
|
# Convert all GFIDs for which no other additional details available
|
|
+ logger.info("[3/4] Starting 'gfid to path using pgfid' conversions ...")
|
|
gfid_to_path_using_pgfid(brick, changelog_data, args)
|
|
changelog_data.commit()
|
|
+ logger.info("[3/4] Finished 'gfid to path using pgfid' conversions.")
|
|
|
|
# If some GFIDs fail to get converted from previous step,
|
|
# convert using find
|
|
+ logger.info("[4/4] Starting 'gfid to path using batchfind' "
|
|
+ "conversions ...")
|
|
gfid_to_path_using_batchfind(brick, changelog_data)
|
|
changelog_data.commit()
|
|
+ logger.info("[4/4] Finished 'gfid to path using batchfind' conversions.")
|
|
|
|
return actual_end
|
|
|
|
--
|
|
1.8.3.1
|
|
|