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