From 48d15f63bb9a1a93d16ad08ecc3db97b84081baf Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Mon, 19 Jun 2017 06:11:48 -0400 Subject: [PATCH 517/525] geo-rep: Fix worker stuck in loop While syncing directories, there are chances that geo-rep worker stuck in loop for errors which can be ignored. e.g., if the directory is not present in the master, it can be ignored. Fixed the same Label: DOWNSTREAM ONLY Change-Id: I375ba4d1ab68ceccf43545ff24dbec74a2982c4c BUG: 1462687 Signed-off-by: Kotresh HR Reviewed-on: https://code.engineering.redhat.com/gerrit/109373 Reviewed-by: Aravinda Vishwanathapura Krishna Murthy --- geo-replication/syncdaemon/master.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py index 96542ae..39dd6ea 100644 --- a/geo-replication/syncdaemon/master.py +++ b/geo-replication/syncdaemon/master.py @@ -780,9 +780,9 @@ class GMasterChangelogMixin(GMasterCommon): num_failures += 1 logging.error('%s FAILED: %s' % (log_prefix, repr(failure))) - if failure[0]['op'] == 'MKDIR': - raise GsyncdError("The above directory failed to sync." - " Please fix it to proceed further.") + if failure[0]['op'] == 'MKDIR': + raise GsyncdError("The above directory failed to sync." + " Please fix it to proceed further.") self.status.inc_value("failures", num_failures) -- 1.8.3.1