From d12c2c34484f92e968dea4a52538205a69d5484f Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Tue, 18 Dec 2018 17:57:25 +0530 Subject: [PATCH 491/493] glusterd: tag rebalance mgmt_v3 command to op-version 31305 In upstream migrating rebalance command is tagged to op-version 60000 but in downstream the latest new op-version is 31305. Label: DOWNSTREAM ONLY Change-Id: I30bbad3efca29bf42b9a750581eb1aebc8a30ff9 BUG: 1652466 Signed-off-by: Atin Mukherjee Reviewed-on: https://code.engineering.redhat.com/gerrit/158943 Tested-by: RHGS Build Bot --- libglusterfs/src/globals.h | 2 -- xlators/mgmt/glusterd/src/glusterd-rebalance.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h index 5e3b180..343263c 100644 --- a/libglusterfs/src/globals.h +++ b/libglusterfs/src/globals.h @@ -111,8 +111,6 @@ #define GD_OP_VERSION_3_13_3 31303 /* Op-version for GlusterFS 3.13.3 */ -#define GD_OP_VERSION_6_0 60000 /* Op-version for GlusterFS 6.0 */ - /* Downstream only change */ #define GD_OP_VERSION_3_11_2 31102 /* Op-version for RHGS 3.3.1-async */ #define GD_OP_VERSION_3_13_3 31303 /* Op-version for RHGS-3.4-Batch Update-1*/ diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index 7ba5f65..ba32241 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -569,12 +569,12 @@ __glusterd_handle_defrag_volume (rpcsvc_request_t *req) } else op = GD_OP_REBALANCE; - if (priv->op_version < GD_OP_VERSION_6_0) { + if (priv->op_version < GD_OP_VERSION_3_13_5) { gf_msg_debug(this->name, 0, "The cluster is operating at " "version less than %d. Falling back " "to op-sm framework.", - GD_OP_VERSION_6_0); + GD_OP_VERSION_3_13_5); ret = glusterd_op_begin(req, op, dict, msg, sizeof(msg)); glusterd_friend_sm(); glusterd_op_sm(); -- 1.8.3.1