|
 |
256ebe |
From 254033a80d85460675c921c272fb94bb7e9f67d4 Mon Sep 17 00:00:00 2001
|
|
|
256ebe |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
256ebe |
Date: Tue, 18 Dec 2018 17:57:25 +0530
|
|
|
256ebe |
Subject: [PATCH 35/52] glusterd: tag rebalance mgmt_v3 command to op-version
|
|
|
256ebe |
31305
|
|
|
256ebe |
|
|
|
256ebe |
In upstream migrating rebalance command is tagged to op-version 60000
|
|
|
256ebe |
but in downstream the latest new op-version is 31305.
|
|
|
256ebe |
|
|
|
256ebe |
Label: DOWNSTREAM ONLY
|
|
|
256ebe |
|
|
|
256ebe |
Change-Id: I30bbad3efca29bf42b9a750581eb1aebc8a30ff9
|
|
|
256ebe |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
256ebe |
Reviewed-on: https://code.engineering.redhat.com/gerrit/158943
|
|
|
256ebe |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
256ebe |
---
|
|
|
256ebe |
xlators/mgmt/glusterd/src/glusterd-rebalance.c | 4 ++--
|
|
|
256ebe |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
256ebe |
|
|
|
256ebe |
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
|
|
|
256ebe |
index e20e3c4..ed5ded5 100644
|
|
|
256ebe |
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
|
|
|
256ebe |
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
|
|
|
256ebe |
@@ -573,12 +573,12 @@ __glusterd_handle_defrag_volume(rpcsvc_request_t *req)
|
|
|
256ebe |
} else
|
|
|
256ebe |
op = GD_OP_REBALANCE;
|
|
|
256ebe |
|
|
|
256ebe |
- if (priv->op_version < GD_OP_VERSION_6_0) {
|
|
|
256ebe |
+ if (priv->op_version < GD_OP_VERSION_3_13_5) {
|
|
|
256ebe |
gf_msg_debug(this->name, 0,
|
|
|
256ebe |
"The cluster is operating at "
|
|
|
256ebe |
"version less than %d. Falling back "
|
|
|
256ebe |
"to op-sm framework.",
|
|
|
256ebe |
- GD_OP_VERSION_6_0);
|
|
|
256ebe |
+ GD_OP_VERSION_3_13_5);
|
|
|
256ebe |
ret = glusterd_op_begin(req, op, dict, msg, sizeof(msg));
|
|
|
256ebe |
glusterd_friend_sm();
|
|
|
256ebe |
glusterd_op_sm();
|
|
|
256ebe |
--
|
|
|
256ebe |
1.8.3.1
|
|
|
256ebe |
|