From: John L. Hammond <john.hammond@intel.com>
Date: Wed, 2 May 2018 14:09:05 +0000 (-0500)
Subject: LU-10978 utils: preserve lustre_rsync state
X-Git-Tag: 2.11.53~98
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=75c0f9c701a7a5f1e9caeee1a6cd7164e6635dfb

LU-10978 utils: preserve lustre_rsync state

In lustre_rsync, if debugging is enabled then we zero-out info and ext
in each iteration of the main loop of lr_replicate(). This may prevent
the consumed changelog entries from being cleared at the end of
lr_replicate().

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: Ibd089524ca6cd6f488fc3558882cc431fdf65de7
Reviewed-on: https://review.whamcloud.com/32246
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/utils/lustre_rsync.c b/lustre/utils/lustre_rsync.c
index 7db491b..e4bc0e5 100644
--- a/lustre/utils/lustre_rsync.c
+++ b/lustre/utils/lustre_rsync.c
@@ -1668,10 +1668,6 @@ int lr_replicate()
                                 break;
                 }
                 lr_clear_cl(info, 0);
-                if (debug) {
-                        bzero(info, sizeof(struct lr_info));
-                        bzero(ext, sizeof(struct lr_info));
-                }
         }
 
         llapi_changelog_fini(&changelog_priv);