From 43b68bb25c9ee16c10342ef643a6ecb82a345e16 Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Tue, 15 Feb 2011 18:01:54 +0000 Subject: syncdaemon: fix RePCe version query RepceClient.repce_version fetched its own RePCe version, instead of querying peer, so lame. Signed-off-by: Csaba Henk Signed-off-by: Anand V. Avati BUG: 2381 (RePCe versioning) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2381 --- xlators/features/marker/utils/syncdaemon/repce.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'xlators/features/marker/utils/syncdaemon/repce.py') diff --git a/xlators/features/marker/utils/syncdaemon/repce.py b/xlators/features/marker/utils/syncdaemon/repce.py index aebc8b7d80c..1b8d0203cff 100644 --- a/xlators/features/marker/utils/syncdaemon/repce.py +++ b/xlators/features/marker/utils/syncdaemon/repce.py @@ -65,12 +65,15 @@ class RepceServer(object): rid = in_data[0] rmeth = in_data[1] exc = False - try: - res = getattr(self.obj, rmeth)(*in_data[2:]) - except: - res = sys.exc_info()[1] - exc = True - logging.exception("call failed: ") + if rmeth == '__repce_version__': + res = repce_version + else: + try: + res = getattr(self.obj, rmeth)(*in_data[2:]) + except: + res = sys.exc_info()[1] + exc = True + logging.exception("call failed: ") send(self.out, rid, exc, res) @@ -151,7 +154,7 @@ class RepceClient(object): return self.mprx(self, meth) def __version__(self): - d = {'proto': repce_version} + d = {'proto': self('__repce_version__')} try: d['object'] = self('version') except AttributeError: -- cgit