summaryrefslogtreecommitdiffstats
path: root/geo-replication
diff options
context:
space:
mode:
authorKotresh H R <khiremat@redhat.com>2014-05-30 01:43:15 +0530
committerVenky Shankar <vshankar@redhat.com>2014-11-12 04:28:32 -0800
commitc5c19a353da77b5c4f00dada26023604b71f3ad7 (patch)
treef3b3c1a84a8c6cc416bfbe4d10dd57117066a92e /geo-replication
parentbeedf68266f19ac77b77f2ec5f9533f3e63c159f (diff)
feature/geo-rep: Fix skipped files logging.
When changelog is failed to process even after max retries, files are skipped but were not logging. This patch addresses this issue to log the skipped files. BUG: 1159198 Change-Id: I1f3d62cb61a940ee5e10e5a79e08fa65e1c15e97 Reviewed-on: http://review.gluster.org/7945 Signed-off-by: Kotresh HR <khiremat@redhat.com> Reviewed-on: http://review.gluster.org/9022 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Venky Shankar <vshankar@redhat.com> Tested-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'geo-replication')
-rw-r--r--geo-replication/syncdaemon/master.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
index d8d26baafe1..51c1e571e53 100644
--- a/geo-replication/syncdaemon/master.py
+++ b/geo-replication/syncdaemon/master.py
@@ -241,6 +241,8 @@ class TarSSHEngine(object):
def a_syncdata(self, files):
self.unlinked_gfids = []
logging.debug('files: %s' % (files))
+ self.current_files_skipped_count = 0
+ del self.skipped_gfid_list[:]
for f in files:
pb = self.syncer.add(f)
@@ -256,6 +258,9 @@ class TarSSHEngine(object):
self.unlinked_gfids.append(se)
return True
logging.warn('tar+ssh: %s [errcode: %d]' % (se, rv[1]))
+ se_list = se.split('/');
+ self.current_files_skipped_count += 1
+ self.skipped_gfid_list.append(se_list[1])
self.add_job(self.FLAT_DIR_HIERARCHY, 'reg', regjob, f, None, pb)
def syncdata_wait(self):
@@ -274,6 +279,8 @@ class RsyncEngine(object):
def a_syncdata(self, files):
self.unlinked_gfids = []
logging.debug('files: %s' % (files))
+ self.current_files_skipped_count = 0
+ del self.skipped_gfid_list[:]
for f in files:
logging.debug('candidate for syncing %s' % f)
pb = self.syncer.add(f)
@@ -292,6 +299,9 @@ class RsyncEngine(object):
self.unlinked_gfids.append(se)
return True
logging.warn('Rsync: %s [errcode: %d]' % (se, rv[1]))
+ se_list = se.split('/');
+ self.current_files_skipped_count += 1
+ self.skipped_gfid_list.append(se_list[1])
self.add_job(self.FLAT_DIR_HIERARCHY, 'reg', regjob, f, None, pb)
def syncdata_wait(self):