summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenky Shankar <vshankar@redhat.com>2015-03-20 03:13:27 +0530
committerVenky Shankar <vshankar@redhat.com>2015-03-27 02:04:09 -0700
commitd331c3196392dd6cf857b79388780bf03b802392 (patch)
tree25714e70b35516609fea087c0e10f10689a07ee6
parentd15dedd8c99e84018a50130a8ffe5e971b9f7bd4 (diff)
geo-rep: Use gfchangelog context init API
With the RPC based changes to {libgf}changelog, changelog_init is required before changelog_register. Change-Id: Id125b2bd2e51aaaffa22ecab463dfb739c50d83c Signed-off-by: Venky Shankar <vshankar@redhat.com> BUG: 1170075 Reviewed-on: http://review.gluster.org/9993 Reviewed-by: Saravanakumar Arumugam <sarumuga@redhat.com> Tested-by: Saravanakumar Arumugam <sarumuga@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--geo-replication/syncdaemon/changelogagent.py3
-rw-r--r--geo-replication/syncdaemon/libgfchangelog.py6
-rw-r--r--geo-replication/syncdaemon/resource.py1
3 files changed, 10 insertions, 0 deletions
diff --git a/geo-replication/syncdaemon/changelogagent.py b/geo-replication/syncdaemon/changelogagent.py
index 54d82cefcd2..ad5f69cfb23 100644
--- a/geo-replication/syncdaemon/changelogagent.py
+++ b/geo-replication/syncdaemon/changelogagent.py
@@ -34,6 +34,9 @@ class Changelog(object):
def version(self):
return CHANGELOG_AGENT_SERVER_VERSION
+ def init(self):
+ return Changes.cl_init()
+
def register(self, cl_brick, cl_dir, cl_log, cl_level, retries=0):
return Changes.cl_register(cl_brick, cl_dir, cl_log, cl_level, retries)
diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py
index ac5ff05bdfa..1d580caf6e8 100644
--- a/geo-replication/syncdaemon/libgfchangelog.py
+++ b/geo-replication/syncdaemon/libgfchangelog.py
@@ -31,6 +31,12 @@ class Changes(object):
return getattr(cls.libgfc, call)
@classmethod
+ def cl_init(cls):
+ ret = cls._get_api('gf_changelog_init')(None)
+ if ret == -1:
+ cls.raise_changelog_err()
+
+ @classmethod
def cl_register(cls, brick, path, log_file, log_level, retries=0):
ret = cls._get_api('gf_changelog_register')(brick, path,
log_file,
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index a4bec50b9ae..10c6406e283 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -1310,6 +1310,7 @@ class GLUSTER(AbstractUrl, SlaveLocal, SlaveRemote):
# register with the changelog library
# 9 == log level (DEBUG)
# 5 == connection retries
+ changelog_agent.init()
changelog_agent.register(gconf.local_path,
workdir, gconf.changelog_log_file,
g2.CHANGELOG_LOG_LEVEL,