From c5c19a353da77b5c4f00dada26023604b71f3ad7 Mon Sep 17 00:00:00 2001 From: Kotresh H R Date: Fri, 30 May 2014 01:43:15 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/9022 Tested-by: Gluster Build System Reviewed-by: Venky Shankar Tested-by: Venky Shankar --- geo-replication/syncdaemon/master.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'geo-replication') 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): -- cgit