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