From 57f66ea86a2fbf61df34b3d6854f639f437cc12b Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Tue, 26 Apr 2016 12:46:18 +0530 Subject: glusterd: fix validation of lower op-version check in volume set Commit 2d87a98 introduced a validation to fail lowering down the cluster.op-version. Commit 2eb8758 actually changed the variable value from cluster's op-version to volume's op-version which resulted the logic go for a toss. Change-Id: I70df32b75c3a3fe47dc840c4a655059e5b124bca BUG: 1330545 Signed-off-by: Atin Mukherjee Reviewed-on: http://review.gluster.org/14069 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Kaushal M Reviewed-on: http://review.gluster.org/14077 --- xlators/mgmt/glusterd/src/glusterd-op-sm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xlators/mgmt/glusterd') diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 20112727d9b..24ef25b0b0f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -1145,7 +1145,7 @@ glusterd_op_stage_set_volume (dict_t *dict, char **op_errstr) "%s", errstr); goto out; } - if (local_key_op_version > local_new_op_version) { + if (local_key_op_version > priv->op_version) { local_new_op_version = local_key_op_version; } else { ret = -1; @@ -1154,7 +1154,7 @@ glusterd_op_stage_set_volume (dict_t *dict, char **op_errstr) " not be equal or lower than current" " cluster op-version (%d).", local_key_op_version, - local_new_op_version); + priv->op_version); gf_msg (this->name, GF_LOG_ERROR, 0, GD_MSG_VERSION_UNSUPPORTED, "%s", errstr); -- cgit