summaryrefslogtreecommitdiffstats
path: root/geo-replication/syncdaemon
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2018-08-24 07:16:18 -0400
committerAravinda VK <avishwan@redhat.com>2018-08-27 03:46:06 +0000
commit98714f503768db9a2ee442a544702c801a31ae6d (patch)
tree15b208e6b50294ed5d6cd606ef204e6b1e522784 /geo-replication/syncdaemon
parentf74181f85ab953b1f08eae358784e4b102b773b9 (diff)
geo-rep: Make automatic gfid conflict resolution optional
Autmatic gfid conflict resolution needs to be disabled during failover/failback as it might lead to data loss in the following scenario. 1. Master went down without syncing directory "dir1" to slave. 2. When slave is failed over to master, if a new file is written inside "dir1", creating dir1 again if not present, "dir1" ends up with different gfid on original slave. 3. When original master is up and failed back, due to automatic gfid conflict resolution, "dir1" present in original master is deleted losing all files and only new file created on original slave is restored. Hence during failover/failback, automatic gfid conflict resolution should be disabled. So in these cases, appropriate decision is taken. fixes: bz#1622076 Signed-off-by: Kotresh HR <khiremat@redhat.com> Change-Id: I433616f5d3e13d4b6eb675475bd554ca34928573
Diffstat (limited to 'geo-replication/syncdaemon')
-rw-r--r--geo-replication/syncdaemon/master.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
index 7985aac5439..3ca60c65a07 100644
--- a/geo-replication/syncdaemon/master.py
+++ b/geo-replication/syncdaemon/master.py
@@ -1163,16 +1163,18 @@ class GMasterChangelogMixin(GMasterCommon):
self.status.inc_value("entry", len(entries))
failures = self.slave.server.entry_ops(entries)
- count = 0
- while failures and count < self.MAX_OE_RETRIES:
- count += 1
- self.handle_entry_failures(failures, entries)
- logging.info("Retry original entries. count = %s" % count)
- failures = self.slave.server.entry_ops(entries)
- if not failures:
- logging.info("Sucessfully fixed all entry ops with gfid "
- "mismatch")
- break
+
+ if gconf.get("gfid-conflict-resolution"):
+ count = 0
+ while failures and count < self.MAX_OE_RETRIES:
+ count += 1
+ self.handle_entry_failures(failures, entries)
+ logging.info("Retry original entries. count = %s" % count)
+ failures = self.slave.server.entry_ops(entries)
+ if not failures:
+ logging.info("Sucessfully fixed all entry ops with "
+ "gfid mismatch")
+ break
self.log_failures(failures, 'gfid', gauxpfx(), 'ENTRY')
self.status.dec_value("entry", len(entries))