From 86ee23319284e62351488f5c76625f0bb3aaad73 Mon Sep 17 00:00:00 2001 From: Aravinda VK Date: Thu, 26 Jun 2014 16:25:59 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/8183 Tested-by: Gluster Build System Reviewed-by: Kotresh HR Reviewed-by: Venky Shankar Tested-by: Venky Shankar --- geo-replication/syncdaemon/master.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'geo-replication') 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') -- cgit