diff options
| author | Csaba Henk <csaba@gluster.com> | 2011-02-07 20:28:48 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2011-02-10 22:17:26 -0800 |
| commit | ff7a493428e011f961d541e59e52ddb53c331d9c (patch) | |
| tree | e0eb72dd7a31a8e7688e15282863f74b88b753c0 /xlators | |
| parent | b6fcde94b37ba6d669ef24e4537846f33ac8ef41 (diff) | |
syncdaemon: refine RePCe version check to tolerate difference in minor
Signed-off-by: Csaba Henk <csaba@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 2381 (RePCe versioning)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2381
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/features/marker/utils/syncdaemon/resource.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xlators/features/marker/utils/syncdaemon/resource.py b/xlators/features/marker/utils/syncdaemon/resource.py index 7ba7cb9d453..052c96ed3e3 100644 --- a/xlators/features/marker/utils/syncdaemon/resource.py +++ b/xlators/features/marker/utils/syncdaemon/resource.py @@ -227,8 +227,13 @@ class SlaveRemote(object): self.server = RepceClient(i, o) rv = self.server.__version__() exrv = {'proto': repce.repce_version, 'object': Server.version()} - if rv != exrv: - raise RuntimeError("RePCe version mismatch: local %s, remote %s" % (exrv, rv)) + da0 = (rv, exrv) + da1 = ({}, {}) + for i in range(2): + for k, v in da0[i].iteritems(): + da1[i][k] = int(v) + if da1[0] != da1[1]: + raise RuntimeError("RePCe major version mismatch: local %s, remote %s" % (exrv, rv)) if gconf.timeout and int(gconf.timeout) > 0: def pinger(): while True: |