From 65757e0f57f93103d87fdf9534c5ca25b66d14b7 Mon Sep 17 00:00:00 2001 From: Aravinda VK Date: Mon, 5 May 2014 11:04:00 +0530 Subject: geo-rep: Changelog History consumption more fixes Number of parallel threads to process changelog history is made configurable via sync_jobs Change-Id: Idcd8e655d9df540cfa48648b9e98af941f95e9d0 Signed-off-by: Aravinda VK Reviewed-on: http://review.gluster.org/7660 Reviewed-by: Venky Shankar Tested-by: Venky Shankar --- geo-replication/syncdaemon/master.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'geo-replication/syncdaemon/master.py') diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py index 3047c99050e..b6a7c894814 100644 --- a/geo-replication/syncdaemon/master.py +++ b/geo-replication/syncdaemon/master.py @@ -1128,19 +1128,12 @@ class GMasterChangelogMixin(GMasterCommon): self.process(changes) def register(self): - (workdir, logfile) = self.setup_working_dir() self.sleep_interval = int(gconf.change_interval) self.changelog_done_func = self.master.server.changelog_done - # register with the changelog library - # 9 == log level (DEBUG) - # 5 == connection retries - self.master.server.changelog_register(gconf.local_path, - workdir, logfile, 9, 5) class GMasterChangeloghistoryMixin(GMasterChangelogMixin): def register(self): - super(GMasterChangeloghistoryMixin, self).register() self.changelog_register_time = int(time.time()) self.changelog_done_func = self.master.server.history_changelog_done @@ -1166,7 +1159,8 @@ class GMasterChangeloghistoryMixin(GMasterChangelogMixin): ".glusterfs/changelogs") ts = self.master.server.history_changelog(changelog_path, purge_time[0], - self.changelog_register_time) + self.changelog_register_time, + int(gconf.sync_jobs)) # scan followed by getchanges till scan returns zero. # history_changelog_scan() is blocking call, till it gets the number -- cgit