summaryrefslogtreecommitdiffstats
path: root/geo-replication/syncdaemon/resource.py
diff options
context:
space:
mode:
authorAravinda VK <avishwan@redhat.com>2016-08-31 11:53:06 +0530
committerAravinda VK <avishwan@redhat.com>2016-09-08 09:14:08 -0700
commit001b2080de3793d02d988825db97fd2d4cba4829 (patch)
tree6a2d1bec5a2dbbf56eaf455abb182381aa1d5204 /geo-replication/syncdaemon/resource.py
parent23e3204489151009f87100fd4eb98a33210a4565 (diff)
geo-rep: Fix History post process
This patch removes changelogsdb part of post processing since not got much performance advantage as expected. Entry stime and other logging improvements retained. > Reviewed-on: http://review.gluster.org/15371 > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Kotresh HR <khiremat@redhat.com> > Smoke: Gluster Build System <jenkins@build.gluster.org> BUG: 1374153 Change-Id: Ib99d23f09d96c14bc28225b47d9134260f5551bf Signed-off-by: Aravinda VK <avishwan@redhat.com> (cherry picked from commit 5de500cd0116796ff797099c60d33258bd48ce3c) Change-Id: If4ac94de557dd79a1e7c43e01ea8a1d6566569f4 Reviewed-on: http://review.gluster.org/15424 Tested-by: Aravinda VK <avishwan@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Kotresh HR <khiremat@redhat.com>
Diffstat (limited to 'geo-replication/syncdaemon/resource.py')
-rw-r--r--geo-replication/syncdaemon/resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index 91ca1916f6a..00bf4cb9d5c 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -31,6 +31,7 @@ import shutil
from gconf import gconf
import repce
from repce import RepceServer, RepceClient
+from master import gmaster_builder
import syncdutils
from syncdutils import GsyncdError, select, privileged, boolify, funcode
from syncdutils import umask, entry2pb, gauxpfx, errno_wrap, lstat
@@ -1408,7 +1409,6 @@ class GLUSTER(AbstractUrl, SlaveLocal, SlaveRemote):
def gmaster_instantiate_tuple(self, slave):
"""return a tuple of the 'one shot' and the 'main crawl'
class instance"""
- from master import gmaster_builder
return (gmaster_builder('xsync')(self, slave),
gmaster_builder()(self, slave),
gmaster_builder('changeloghistory')(self, slave))