summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAravinda VK <avishwan@redhat.com>2014-06-26 16:25:59 +0530
committerVenky Shankar <vshankar@redhat.com>2014-07-01 03:59:01 -0700
commit86ee23319284e62351488f5c76625f0bb3aaad73 (patch)
treedf788ce1f122247db1938646d466011aeacf63ba
parent991dd5e4709296d80358d6d076507635c6b3b1e1 (diff)
geo-rep: History Change detector method select issue
Geo-rep does history crawl even if change-detector is set to xsync. This patch fixes by taking priority to user configured change detector. BUG: 1113525 Change-Id: Ic6c34e187c9cb6608c9ef8a010ea07015ba60a80 Signed-off-by: Aravinda VK <avishwan@redhat.com> Reviewed-on: http://review.gluster.org/8183 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kotresh HR <khiremat@redhat.com> Reviewed-by: Venky Shankar <vshankar@redhat.com> Tested-by: Venky Shankar <vshankar@redhat.com>
-rw-r--r--geo-replication/syncdaemon/master.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
index 645f77524f0..c35ae8d2239 100644
--- a/geo-replication/syncdaemon/master.py
+++ b/geo-replication/syncdaemon/master.py
@@ -62,7 +62,8 @@ def gmaster_builder(excrawl=None):
modemixin = gconf.special_sync_mode
if not modemixin:
modemixin = 'normal'
- changemixin = isinstance(excrawl, str) and excrawl or gconf.change_detector
+ changemixin = 'xsync' if gconf.change_detector == 'xsync' \
+ else excrawl or gconf.change_detector
logging.info('setting up %s change detection mode' % changemixin)
modemixin = getattr(this, modemixin.capitalize() + 'Mixin')
crawlmixin = getattr(this, 'GMaster' + changemixin.capitalize() + 'Mixin')