From ff97d22a02c02ad5edced2755a799a587b45cb79 Mon Sep 17 00:00:00 2001
From: Sanju Rakonde <srakonde@redhat.com>
Date: Mon, 17 Dec 2018 14:07:01 +0530
Subject: [PATCH 472/493] glusterd: introduce a new op-version for rhgs-3.4.3

This patch introduces a new op-version 31305 for rhgs-3.4.3 and
sets the max op-version to 31305.

For migrating profile commands (commit e68845ff7018e5d81d7979684b18e6eda449b088)
we used GD_OP_VERSION_6_0 in upstream. we are changing
it to GD_OP_VERSION_3_13_5 here.

Label: DOWNSTREAM ONLY

Change-Id: Ie3a05c70eb4e406889c468343f54e999b1218f19
BUG: 1639476
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/158795
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 libglusterfs/src/globals.h                   | 5 ++---
 xlators/mgmt/glusterd/src/glusterd-handler.c | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h
index d2b0964..343263c 100644
--- a/libglusterfs/src/globals.h
+++ b/libglusterfs/src/globals.h
@@ -43,7 +43,7 @@
  */
 #define GD_OP_VERSION_MIN  1 /* MIN is the fresh start op-version, mostly
                                 should not change */
-#define GD_OP_VERSION_MAX  GD_OP_VERSION_3_13_4 /* MAX VERSION is the maximum
+#define GD_OP_VERSION_MAX  GD_OP_VERSION_3_13_5 /* MAX VERSION is the maximum
                                                   count in VME table, should
                                                   keep changing with
                                                   introduction of newer
@@ -111,12 +111,11 @@
 
 #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*/
 #define GD_OP_VERSION_3_13_4   31304 /* Op-version for RHGS-3.4-Batch Update-2*/
+#define GD_OP_VERSION_3_13_5   31305 /* Op-version for RHGS-3.4-Batch Update-3*/
 
 #include "xlator.h"
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index 90eaa95..c71bf3c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -3113,10 +3113,10 @@ __glusterd_handle_cli_profile_volume (rpcsvc_request_t *req)
                 goto out;
         }
 
-        if (conf->op_version < GD_OP_VERSION_6_0) {
+        if (conf->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);
+                             "framework.", GD_OP_VERSION_3_13_5);
                 ret = glusterd_op_begin(req, cli_op, dict, err_str, sizeof(err_str));
                 glusterd_friend_sm();
                 glusterd_op_sm();
-- 
1.8.3.1