summaryrefslogtreecommitdiffstats
path: root/geo-replication/syncdaemon/master.py
diff options
context:
space:
mode:
authorKotresh H R <khiremat@redhat.com>2014-05-30 01:43:15 +0530
committerVenky Shankar <vshankar@redhat.com>2014-10-16 03:34:39 -0700
commit1dc824c6180ba7d2a620c5a660bdc5cabe7aabc1 (patch)
tree19fb893c170ae905d2068c0f7a946ac3f504221b /geo-replication/syncdaemon/master.py
parent6c13daed1d601df76cfd1973d3ce800afa877fd2 (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. Change-Id: Ic617e4151231fe18a171efa57a119e21164e1a6a BUG: 1103577 Signed-off-by: Kotresh H R <khiremat@redhat.com> Reviewed-on: http://review.gluster.org/7945 Reviewed-by: Aravinda VK <avishwan@redhat.com> 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/syncdaemon/master.py')
-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):