From 0ab4ff660512d0b8bb539e93c2b3a970860a0ba0 Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Tue, 26 Apr 2016 12:46:18 +0530 Subject: [PATCH 090/104] glusterd: fix validation of lower op-version check in volume set Backport of http://review.gluster.org/14077 http://review.gluster.org/14069 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: 1101702 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 Reviewed-on: https://code.engineering.redhat.com/gerrit/73088 --- .../bug-1315186-reject-lowering-down-op-version.t | 22 ++++++++++++++++++++ xlators/mgmt/glusterd/src/glusterd-op-sm.c | 4 +- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 tests/bugs/glusterd/bug-1315186-reject-lowering-down-op-version.t diff --git a/tests/bugs/glusterd/bug-1315186-reject-lowering-down-op-version.t b/tests/bugs/glusterd/bug-1315186-reject-lowering-down-op-version.t new file mode 100644 index 0000000..4bd6eaa --- /dev/null +++ b/tests/bugs/glusterd/bug-1315186-reject-lowering-down-op-version.t @@ -0,0 +1,22 @@ +#! /bin/bash + +. $(dirname $0)/../../include.rc + +# The test validates that lowering down the op-version should fail + +cleanup + +TEST glusterd +TEST pidof glusterd + +#volume create is just to ensure glusterd.info file is created +TEST $CLI volume create $V0 $H0:$B0/b1 + +GDWD=$($CLI system getwd) +OP_VERS_ORIG=$(grep 'operating-version' ${GDWD}/glusterd.info | cut -d '=' -f 2) +OP_VERS_NEW=`expr $OP_VERS_ORIG-1` + +TEST ! $CLI volume set all $V0 cluster.op-version $OP_VERS_NEW + +cleanup; + diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 51a5c34..2d40552 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); -- 1.7.1