summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/server/src
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2009-06-25 16:11:44 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-06-29 09:59:12 -0700
commit66224718ab57238e16b30d8b461c380d64df237c (patch)
tree10378539c11985cef53ba1121ab18d52c903a9db /xlators/protocol/server/src
parentdc321571317b911faa31eed8b3bd4ce396963179 (diff)
version check between client/server made more specific to protocol only.
This patch is a step towards giving compatibility between the versions of GlusterFS. Now onwards, the protocol-version won't depend on release versions. In general, multiple glusterfs versions can have common protocol-version. Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
Diffstat (limited to 'xlators/protocol/server/src')
-rw-r--r--xlators/protocol/server/src/server-protocol.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xlators/protocol/server/src/server-protocol.c b/xlators/protocol/server/src/server-protocol.c
index 6faf0a5171b..accd8358f3f 100644
--- a/xlators/protocol/server/src/server-protocol.c
+++ b/xlators/protocol/server/src/server-protocol.c
@@ -6955,7 +6955,7 @@ mop_setvolume (call_frame_t *frame, xlator_t *bound_xl,
if (trans->xl_private != conn)
trans->xl_private = conn;
- ret = dict_get_str (params, "version", &version);
+ ret = dict_get_str (params, "protocol-version", &version);
if (ret < 0) {
ret = dict_set_str (reply, "ERROR",
"No version number specified");
@@ -6968,11 +6968,11 @@ mop_setvolume (call_frame_t *frame, xlator_t *bound_xl,
goto fail;
}
- ret = strcmp (version, PACKAGE_VERSION);
+ ret = strcmp (version, GF_PROTOCOL_VERSION);
if (ret != 0) {
asprintf (&msg,
- "Version mismatch: client(%s) Vs server (%s)",
- version, PACKAGE_VERSION);
+ "protocol version mismatch: client(%s) - server(%s)",
+ version, GF_PROTOCOL_VERSION);
ret = dict_set_dynstr (reply, "ERROR", msg);
if (ret < 0)
gf_log (trans->xl->name, GF_LOG_DEBUG,