From 78060c16f88594b3424e512a9ef0e4a8f56e88c3 Mon Sep 17 00:00:00 2001

From: Kaushal M <kmadappa@redhat.com>

Date: Thu, 6 Dec 2018 15:04:16 +0530

Subject: [PATCH 02/52] glusterd: fix op-versions for RHS backwards

 compatability

Backport of https://code.engineering.redhat.com/gerrit/#/c/60485/

This change fixes the op-version of different features and checks to maintain

backwards compatability with RHS-3.0 and before.

Label: DOWNSTREAM ONLY

Change-Id: Icb282444da179b12fbd6ed9f491514602f1a38c2

Signed-off-by: Atin Mukherjee <amukherj@redhat.com>

Reviewed-on: https://code.engineering.redhat.com/gerrit/70348

---

 libglusterfs/src/glusterfs/globals.h               |  45 +++--

 rpc/rpc-transport/socket/src/socket.c              |   4 +-

 xlators/cluster/dht/src/dht-shared.c               |   6 +-

 xlators/debug/io-stats/src/io-stats.c              |  16 +-

 xlators/features/barrier/src/barrier.c             |   4 +-

 xlators/mgmt/glusterd/src/glusterd-brick-ops.c     |   8 +-

 xlators/mgmt/glusterd/src/glusterd-handler.c       |  14 +-

 xlators/mgmt/glusterd/src/glusterd-op-sm.c         |  16 +-

 xlators/mgmt/glusterd/src/glusterd-peer-utils.c    |   8 +-

 xlators/mgmt/glusterd/src/glusterd-rebalance.c     |   4 +-

 xlators/mgmt/glusterd/src/glusterd-replace-brick.c |   4 +-

 xlators/mgmt/glusterd/src/glusterd-rpc-ops.c       |   6 +-

 xlators/mgmt/glusterd/src/glusterd-sm.c            |   2 +-

 .../mgmt/glusterd/src/glusterd-snapshot-utils.c    |  12 +-

 xlators/mgmt/glusterd/src/glusterd-snapshot.c      |   4 +-

 xlators/mgmt/glusterd/src/glusterd-store.c         |  27 +--

 xlators/mgmt/glusterd/src/glusterd-syncop.c        |   2 +-

 xlators/mgmt/glusterd/src/glusterd-tier.c          |   3 +-

 xlators/mgmt/glusterd/src/glusterd-utils.c         |   8 +-

 xlators/mgmt/glusterd/src/glusterd-volume-ops.c    |  12 +-

 xlators/mgmt/glusterd/src/glusterd-volume-set.c    | 192 +++++++++++----------

 xlators/protocol/client/src/client.c               |   4 +-

 xlators/protocol/server/src/server.c               |   6 +-

 xlators/storage/posix/src/posix-common.c           |   4 +-

 24 files changed, 214 insertions(+), 197 deletions(-)

diff --git a/libglusterfs/src/glusterfs/globals.h b/libglusterfs/src/glusterfs/globals.h

index 8d898c3..b9da872 100644

--- a/libglusterfs/src/glusterfs/globals.h

+++ b/libglusterfs/src/glusterfs/globals.h

@@ -23,23 +23,28 @@

 #define GF_AVOID_OVERWRITE "glusterfs.avoid.overwrite"

 #define GF_CLEAN_WRITE_PROTECTION "glusterfs.clean.writexattr"

-/* Gluster versions - OP-VERSION mapping

+/* RHS versions - OP-VERSION mapping

  *

- * 3.3.x                - 1

- * 3.4.x                - 2

- * 3.5.0                - 3

- * 3.5.1                - 30501

- * 3.6.0                - 30600

- * 3.7.0                - 30700

- * 3.7.1                - 30701

- * 3.7.2                - 30702

+ * RHS-2.0 Z    - 1

+ * RHS-2.1 Z    - 2

+ * RHS-2.1 u5   - 20105

+ * RHS-3.0      - 30000

+ * RHS-3.0.4    - 30004

+ * RHGS-3.1     - 30702

  *

- * Starting with Gluster v3.6, the op-version will be multi-digit integer values

- * based on the Glusterfs version, instead of a simply incrementing integer

- * value. The op-version for a given X.Y.Z release will be an integer XYZ, with

- * Y and Z 2 digit always 2 digits wide and padded with 0 when needed. This

- * should allow for some gaps between two Y releases for backports of features

- * in Z releases.

+ *

+ * NOTE:

+ * Starting with RHS-3.0, the op-version will be multi-digit integer values

+ * based on the RHS version, instead of a simply incrementing integer value. The

+ * op-version for a given RHS X(Major).Y(Minor).Z(Update) release will be an

+ * integer with digits XYZ. The Y and Z values will be 2 digits wide always

+ * padded with 0 as needed. This should allow for some gaps between two Y

+ * releases for backports of features in Z releases.

+ *

+ * NOTE:

+ * Starting with RHGS-3.1, the op-version will be the same as the upstream

+ * GlusterFS op-versions. This is to allow proper access to upstream clients of

+ * version 3.7.x or greater, proper access to the RHGS volumes.

  */

 #define GD_OP_VERSION_MIN                                                      \

     1 /* MIN is the fresh start op-version, mostly                             \

@@ -51,7 +56,13 @@

                          introduction of newer                                 \

                          versions */

-#define GD_OP_VERSION_3_6_0 30600 /* Op-Version for GlusterFS 3.6.0 */

+#define GD_OP_VERSION_RHS_3_0    30000 /* Op-Version of RHS 3.0 */

+

+#define GD_OP_VER_PERSISTENT_AFR_XATTRS GD_OP_VERSION_RHS_3_0

+

+#define GD_OP_VERSION_RHS_2_1_5  20105 /* RHS 2.1 update 5 */

+

+#define GD_OP_VERSION_RHS_3_0_4  30004 /* Op-Version of RHS 3.0.4 */

 #define GD_OP_VERSION_3_7_0 30700 /* Op-version for GlusterFS 3.7.0 */

@@ -115,8 +126,6 @@

 #define GD_OP_VERSION_6_0 60000 /* Op-version for GlusterFS 6.0 */

-#define GD_OP_VER_PERSISTENT_AFR_XATTRS GD_OP_VERSION_3_6_0

-

 #include "glusterfs/xlator.h"

 #include "glusterfs/options.h"

diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c

index fa0e0f2..121d46b 100644

--- a/rpc/rpc-transport/socket/src/socket.c

+++ b/rpc/rpc-transport/socket/src/socket.c

@@ -4704,7 +4704,7 @@ struct volume_options options[] = {

      .description = "SSL CA list. Ignored if SSL is not enabled."},

     {.key = {"ssl-cert-depth"},

      .type = GF_OPTION_TYPE_INT,

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE,

      .description = "Maximum certificate-chain depth.  If zero, the "

                     "peer's certificate itself must be in the local "

@@ -4713,7 +4713,7 @@ struct volume_options options[] = {

                     "local list.  Ignored if SSL is not enabled."},

     {.key = {"ssl-cipher-list"},

      .type = GF_OPTION_TYPE_STR,

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE,

      .description = "Allowed SSL ciphers. Ignored if SSL is not enabled."},

     {.key = {"ssl-dh-param"},

diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c

index c7ef2f1..ea4b7c6 100644

--- a/xlators/cluster/dht/src/dht-shared.c

+++ b/xlators/cluster/dht/src/dht-shared.c

@@ -1064,7 +1064,7 @@ struct volume_options dht_options[] = {

          "When enabled, files will be allocated to bricks "

          "with a probability proportional to their size.  Otherwise, all "

          "bricks will have the same probability (legacy behavior).",

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .level = OPT_STATUS_BASIC,

      .flags = OPT_FLAG_CLIENT_OPT | OPT_FLAG_SETTABLE | OPT_FLAG_DOC},

@@ -1161,7 +1161,7 @@ struct volume_options dht_options[] = {

             "from which hash ranges are allocated starting with 0. "

             "Note that we still use a directory/file's name to determine the "

             "subvolume to which it hashes",

-        .op_version = {GD_OP_VERSION_3_6_0},

+        .op_version = {GD_OP_VERSION_RHS_3_0},

     },

     {.key = {"rebal-throttle"},

@@ -1174,7 +1174,7 @@ struct volume_options dht_options[] = {

                     "migrated at a time. Lazy will allow only one file to "

                     "be migrated at a time and aggressive will allow "

                     "max of [($(processing units) - 4) / 2), 4]",

-     .op_version = {GD_OP_VERSION_3_7_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .level = OPT_STATUS_BASIC,

      .flags = OPT_FLAG_CLIENT_OPT | OPT_FLAG_SETTABLE | OPT_FLAG_DOC

diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c

index f12191f..41b57c5 100644

--- a/xlators/debug/io-stats/src/io-stats.c

+++ b/xlators/debug/io-stats/src/io-stats.c

@@ -4333,7 +4333,7 @@ struct volume_options options[] = {

      .value = {GF_LOGGER_GLUSTER_LOG, GF_LOGGER_SYSLOG}},

     {.key = {"client-logger"},

      .type = GF_OPTION_TYPE_STR,

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE | OPT_FLAG_CLIENT_OPT | OPT_FLAG_DOC,

      .tags = {"io-stats"},

      .default_value = GF_LOGGER_GLUSTER_LOG,

@@ -4342,7 +4342,7 @@ struct volume_options options[] = {

      .value = {GF_LOGGER_GLUSTER_LOG, GF_LOGGER_SYSLOG}},

     {.key = {"brick-logger"},

      .type = GF_OPTION_TYPE_STR,

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC,

      .tags = {"io-stats"},

      .default_value = GF_LOGGER_GLUSTER_LOG,

@@ -4354,7 +4354,7 @@ struct volume_options options[] = {

      .value = {GF_LOG_FORMAT_NO_MSG_ID, GF_LOG_FORMAT_WITH_MSG_ID}},

     {.key = {"client-log-format"},

      .type = GF_OPTION_TYPE_STR,

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE | OPT_FLAG_CLIENT_OPT | OPT_FLAG_DOC,

      .tags = {"io-stats"},

      .default_value = GF_LOG_FORMAT_WITH_MSG_ID,

@@ -4362,7 +4362,7 @@ struct volume_options options[] = {

      .value = {GF_LOG_FORMAT_NO_MSG_ID, GF_LOG_FORMAT_WITH_MSG_ID}},

     {.key = {"brick-log-format"},

      .type = GF_OPTION_TYPE_STR,

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC,

      .tags = {"io-stats"},

      .default_value = GF_LOG_FORMAT_WITH_MSG_ID,

@@ -4377,7 +4377,7 @@ struct volume_options options[] = {

     },

     {.key = {"client-log-buf-size"},

      .type = GF_OPTION_TYPE_INT,

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE | OPT_FLAG_CLIENT_OPT | OPT_FLAG_DOC,

      .tags = {"io-stats"},

      .min = GF_LOG_LRU_BUFSIZE_MIN,

@@ -4388,7 +4388,7 @@ struct volume_options options[] = {

                     " the value of the option client-log-flush-timeout."},

     {.key = {"brick-log-buf-size"},

      .type = GF_OPTION_TYPE_INT,

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC,

      .tags = {"io-stats"},

      .min = GF_LOG_LRU_BUFSIZE_MIN,

@@ -4406,7 +4406,7 @@ struct volume_options options[] = {

     },

     {.key = {"client-log-flush-timeout"},

      .type = GF_OPTION_TYPE_TIME,

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE | OPT_FLAG_CLIENT_OPT | OPT_FLAG_DOC,

      .tags = {"io-stats"},

      .min = GF_LOG_FLUSH_TIMEOUT_MIN,

@@ -4417,7 +4417,7 @@ struct volume_options options[] = {

                     " the value of the option client-log-flush-timeout."},

     {.key = {"brick-log-flush-timeout"},

      .type = GF_OPTION_TYPE_TIME,

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC,

      .tags = {"io-stats"},

      .min = GF_LOG_FLUSH_TIMEOUT_MIN,

diff --git a/xlators/features/barrier/src/barrier.c b/xlators/features/barrier/src/barrier.c

index a601c7f..0923992 100644

--- a/xlators/features/barrier/src/barrier.c

+++ b/xlators/features/barrier/src/barrier.c

@@ -774,7 +774,7 @@ struct volume_options options[] = {

     {.key = {"barrier"},

      .type = GF_OPTION_TYPE_BOOL,

      .default_value = "disable",

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE,

      .description = "When \"enabled\", blocks acknowledgements to application "

                     "for file operations such as rmdir, rename, unlink, "

@@ -784,7 +784,7 @@ struct volume_options options[] = {

     {.key = {"barrier-timeout"},

      .type = GF_OPTION_TYPE_TIME,

      .default_value = BARRIER_TIMEOUT,

-     .op_version = {GD_OP_VERSION_3_6_0},

+     .op_version = {GD_OP_VERSION_RHS_3_0},

      .flags = OPT_FLAG_SETTABLE,

      .description = "After 'timeout' seconds since the time 'barrier' "

                     "option was set to \"on\", acknowledgements to file "

diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c

index 38483a1..ad9a572 100644

--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c

+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c

@@ -1195,7 +1195,7 @@ glusterd_op_perform_add_bricks(glusterd_volinfo_t *volinfo, int32_t count,

         /* A bricks mount dir is required only by snapshots which were

          * introduced in gluster-3.6.0

          */

-        if (conf->op_version >= GD_OP_VERSION_3_6_0) {

+        if (conf->op_version >= GD_OP_VERSION_RHS_3_0) {

             brick_mount_dir = NULL;

             snprintf(key, sizeof(key), "brick%d.mount_dir", i);

@@ -1729,7 +1729,7 @@ glusterd_op_stage_add_brick(dict_t *dict, char **op_errstr, dict_t *rsp_dict)

             /* A bricks mount dir is required only by snapshots which were

              * introduced in gluster-3.6.0

              */

-            if (conf->op_version >= GD_OP_VERSION_3_6_0) {

+            if (conf->op_version >= GD_OP_VERSION_RHS_3_0) {

                 ret = glusterd_get_brick_mount_dir(

                     brickinfo->path, brickinfo->hostname, brickinfo->mount_dir);

                 if (ret) {

@@ -2085,12 +2085,12 @@ glusterd_op_stage_remove_brick(dict_t *dict, char **op_errstr)

             }

             /* Check if the connected clients are all of version

-             * glusterfs-3.6 and higher. This is needed to prevent some data

+             * RHS-2.1u5 and higher. This is needed to prevent some data

              * loss issues that could occur when older clients are connected

              * when rebalance is run.

              */

             ret = glusterd_check_client_op_version_support(

-                volname, GD_OP_VERSION_3_6_0, NULL);

+                volname, GD_OP_VERSION_RHS_2_1_5, NULL);

             if (ret) {

                 ret = gf_asprintf(op_errstr,

                                   "Volume %s has one or "

diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c

index f754b52..387643d 100644

--- a/xlators/mgmt/glusterd/src/glusterd-handler.c

+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c

@@ -763,7 +763,7 @@ glusterd_op_txn_begin(rpcsvc_request_t *req, glusterd_op_t op, void *ctx,

     }

     /* Based on the op_version, acquire a cluster or mgmt_v3 lock */

-    if (priv->op_version < GD_OP_VERSION_3_6_0) {

+    if (priv->op_version < GD_OP_VERSION_RHS_3_0) {

         ret = glusterd_lock(MY_UUID);

         if (ret) {

             gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_GLUSTERD_LOCK_FAIL,

@@ -818,7 +818,7 @@ glusterd_op_txn_begin(rpcsvc_request_t *req, glusterd_op_t op, void *ctx,

 local_locking_done:

     /* If no volname is given as a part of the command, locks will

      * not be held, hence sending stage event. */

-    if (volname || (priv->op_version < GD_OP_VERSION_3_6_0))

+    if (volname || (priv->op_version < GD_OP_VERSION_RHS_3_0))

         event_type = GD_OP_EVENT_START_LOCK;

     else {

         txn_op_info.state.state = GD_OP_STATE_LOCK_SENT;

@@ -849,7 +849,7 @@ out:

     if (locked && ret) {

         /* Based on the op-version, we release the

          * cluster or mgmt_v3 lock */

-        if (priv->op_version < GD_OP_VERSION_3_6_0)

+        if (priv->op_version < GD_OP_VERSION_RHS_3_0)

             glusterd_unlock(MY_UUID);

         else {

             ret = glusterd_mgmt_v3_unlock(volname, MY_UUID, "vol");

@@ -4432,12 +4432,12 @@ __glusterd_handle_status_volume(rpcsvc_request_t *req)

     }

     if ((cmd & GF_CLI_STATUS_SNAPD) &&

-        (conf->op_version < GD_OP_VERSION_3_6_0)) {

+        (conf->op_version < GD_OP_VERSION_RHS_3_0)) {

         snprintf(err_str, sizeof(err_str),

                  "The cluster is operating "

                  "at a lesser version than %d. Getting the status of "

                  "snapd is not allowed in this state",

-                 GD_OP_VERSION_3_6_0);

+                 GD_OP_VERSION_RHS_3_0);

         ret = -1;

         goto out;

     }

@@ -4459,7 +4459,7 @@ __glusterd_handle_status_volume(rpcsvc_request_t *req)

                  "The cluster is operating "

                  "at a lesser version than %d. Getting the status of "

                  "tierd is not allowed in this state",

-                 GD_OP_VERSION_3_6_0);

+                 GD_OP_VERSION_RHS_3_0);

         ret = -1;

         goto out;

     }

@@ -6430,7 +6430,7 @@ __glusterd_peer_rpc_notify(struct rpc_clnt *rpc, void *mydata,

                      glusterd_friend_sm_state_name_get(peerinfo->state.state));

             if (peerinfo->connected) {

-                if (conf->op_version < GD_OP_VERSION_3_6_0) {

+                if (conf->op_version < GD_OP_VERSION_RHS_3_0) {

                     glusterd_get_lock_owner(&uuid);

                     if (!gf_uuid_is_null(uuid) &&

                         !gf_uuid_compare(peerinfo->uuid, uuid))

diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c

index 6495a9d..dd3f9eb 100644

--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c

+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c

@@ -194,7 +194,7 @@ glusterd_generate_txn_id(dict_t *dict, uuid_t **txn_id)

     if (!*txn_id)

         goto out;

-    if (priv->op_version < GD_OP_VERSION_3_6_0)

+    if (priv->op_version < GD_OP_VERSION_RHS_3_0)

         gf_uuid_copy(**txn_id, priv->global_txn_id);

     else

         gf_uuid_generate(**txn_id);

@@ -1864,12 +1864,12 @@ glusterd_op_stage_status_volume(dict_t *dict, char **op_errstr)

     }

     if ((cmd & GF_CLI_STATUS_SNAPD) &&

-        (priv->op_version < GD_OP_VERSION_3_6_0)) {

+        (priv->op_version < GD_OP_VERSION_RHS_3_0)) {

         snprintf(msg, sizeof(msg),

                  "The cluster is operating at "

                  "version less than %d. Getting the "

                  "status of snapd is not allowed in this state.",

-                 GD_OP_VERSION_3_6_0);

+                 GD_OP_VERSION_RHS_3_0);

         ret = -1;

         goto out;

     }

@@ -3877,7 +3877,7 @@ glusterd_op_ac_send_lock(glusterd_op_sm_event_t *event, void *ctx)

             continue;

         /* Based on the op_version, acquire a cluster or mgmt_v3 lock */

-        if (priv->op_version < GD_OP_VERSION_3_6_0) {

+        if (priv->op_version < GD_OP_VERSION_RHS_3_0) {

             proc = &peerinfo->mgmt->proctable[GLUSTERD_MGMT_CLUSTER_LOCK];

             if (proc->fn) {

                 ret = proc->fn(NULL, this, peerinfo);

@@ -3980,7 +3980,7 @@ glusterd_op_ac_send_unlock(glusterd_op_sm_event_t *event, void *ctx)

             continue;

         /* Based on the op_version,

          * release the cluster or mgmt_v3 lock */

-        if (priv->op_version < GD_OP_VERSION_3_6_0) {

+        if (priv->op_version < GD_OP_VERSION_RHS_3_0) {

             proc = &peerinfo->mgmt->proctable[GLUSTERD_MGMT_CLUSTER_UNLOCK];

             if (proc->fn) {

                 ret = proc->fn(NULL, this, peerinfo);

@@ -4957,7 +4957,7 @@ glusterd_op_modify_op_ctx(glusterd_op_t op, void *ctx)

             count = brick_index_max + other_count + 1;

             /*

-             * a glusterd lesser than version 3.7 will be sending the

+             * a glusterd lesser than version RHS-3.0.4 will be sending the

              * rdma port in older key. Changing that value from here

              * to support backward compatibility

              */

@@ -4977,7 +4977,7 @@ glusterd_op_modify_op_ctx(glusterd_op_t op, void *ctx)

             ret = glusterd_volinfo_find(volname, &volinfo);

             if (ret)

                 goto out;

-            if (conf->op_version < GD_OP_VERSION_3_7_0 &&

+            if (conf->op_version < GD_OP_VERSION_RHS_3_0_4 &&

                 volinfo->transport_type == GF_TRANSPORT_RDMA) {

                 ret = glusterd_op_modify_port_key(op_ctx, brick_index_max);

                 if (ret)

@@ -5576,7 +5576,7 @@ glusterd_op_txn_complete(uuid_t *txn_id)

     glusterd_op_clear_errstr();

     /* Based on the op-version, we release the cluster or mgmt_v3 lock */

-    if (priv->op_version < GD_OP_VERSION_3_6_0) {

+    if (priv->op_version < GD_OP_VERSION_RHS_3_0) {

         ret = glusterd_unlock(MY_UUID);

         /* unlock can't/shouldn't fail here!! */

         if (ret)

diff --git a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c

index 5b5959e..f24c86e 100644

--- a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c

+++ b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c

@@ -547,7 +547,7 @@ out:

  * @prefix. All the parameters are compulsory.

  *

  * The complete address list is added to the dict only if the cluster op-version

- * is >= GD_OP_VERSION_3_6_0

+ * is >= GD_OP_VERSION_3_7_0

  */

 int

 gd_add_friend_to_dict(glusterd_peerinfo_t *friend, dict_t *dict,

@@ -593,7 +593,7 @@ gd_add_friend_to_dict(glusterd_peerinfo_t *friend, dict_t *dict,

         goto out;

     }

-    if (conf->op_version < GD_OP_VERSION_3_6_0) {

+    if (conf->op_version < GD_OP_VERSION_3_7_0) {

         ret = 0;

         goto out;

     }

@@ -778,7 +778,7 @@ gd_update_peerinfo_from_dict(glusterd_peerinfo_t *peerinfo, dict_t *dict,

         GF_FREE(peerinfo->hostname);

     peerinfo->hostname = gf_strdup(hostname);

-    if (conf->op_version < GD_OP_VERSION_3_6_0) {

+    if (conf->op_version < GD_OP_VERSION_3_7_0) {

         ret = 0;

         goto out;

     }

@@ -894,7 +894,7 @@ gd_add_peer_hostnames_to_dict(glusterd_peerinfo_t *peerinfo, dict_t *dict,

     conf = this->private;

     GF_VALIDATE_OR_GOTO(this->name, (conf != NULL), out);

-    if (conf->op_version < GD_OP_VERSION_3_6_0) {

+    if (conf->op_version < GD_OP_VERSION_3_7_0) {

         ret = 0;

         goto out;

     }

diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c

index 34b0294..6365b6e 100644

--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c

+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c

@@ -792,13 +792,13 @@ glusterd_mgmt_v3_op_stage_rebalance(dict_t *dict, char **op_errstr)

         case GF_DEFRAG_CMD_START:

         case GF_DEFRAG_CMD_START_LAYOUT_FIX:

             /* Check if the connected clients are all of version

-             * glusterfs-3.6 and higher. This is needed to prevent some data

+             * RHS-2.1u5 and higher. This is needed to prevent some data

              * loss issues that could occur when older clients are connected

              * when rebalance is run. This check can be bypassed by using

              * 'force'

              */

             ret = glusterd_check_client_op_version_support(

-                volname, GD_OP_VERSION_3_6_0, NULL);

+                volname, GD_OP_VERSION_RHS_2_1_5, NULL);

             if (ret) {

                 ret = gf_asprintf(op_errstr,

                                   "Volume %s has one or "

diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c

index ca1de1a..0615081 100644

--- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c

+++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c

@@ -297,7 +297,7 @@ glusterd_op_stage_replace_brick(dict_t *dict, char **op_errstr,

         if (ret)

             goto out;

-    } else if (priv->op_version >= GD_OP_VERSION_3_6_0) {

+    } else if (priv->op_version >= GD_OP_VERSION_RHS_3_0) {

         /* A bricks mount dir is required only by snapshots which were

          * introduced in gluster-3.6.0

          */

@@ -396,7 +396,7 @@ glusterd_op_perform_replace_brick(glusterd_volinfo_t *volinfo, char *old_brick,

     /* A bricks mount dir is required only by snapshots which were

      * introduced in gluster-3.6.0

      */

-    if (conf->op_version >= GD_OP_VERSION_3_6_0) {

+    if (conf->op_version >= GD_OP_VERSION_RHS_3_0) {

         ret = dict_get_strn(dict, "brick1.mount_dir", SLEN("brick1.mount_dir"),

                             &brick_mount_dir);

         if (ret) {

diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c

index 728781d..4ec9700 100644

--- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c

+++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c

@@ -288,11 +288,11 @@ __glusterd_probe_cbk(struct rpc_req *req, struct iovec *iov, int count,

      * we need to add the new hostname to the peer.

      *

      * This addition should only be done for cluster op-version >=

-     * GD_OP_VERSION_3_6_0 as address lists are only supported from then on.

+     * GD_OP_VERSION_3_7_0 as address lists are only supported from then on.

      * Also, this update should only be done when an explicit CLI probe

      * command was used to begin the probe process.

      */

-    if ((conf->op_version >= GD_OP_VERSION_3_6_0) &&

+    if ((conf->op_version >= GD_OP_VERSION_3_7_0) &&

         (gf_uuid_compare(rsp.uuid, peerinfo->uuid) == 0)) {

         ctx = ((call_frame_t *)myframe)->local;

         /* Presence of ctx->req implies this probe was started by a cli

@@ -1544,7 +1544,7 @@ glusterd_rpc_friend_add(call_frame_t *frame, xlator_t *this, void *data)

         goto out;

     }

-    if (priv->op_version >= GD_OP_VERSION_3_6_0) {

+    if (priv->op_version >= GD_OP_VERSION_RHS_3_0) {

         ret = glusterd_add_missed_snaps_to_export_dict(peer_data);

         if (ret) {

             gf_msg(this->name, GF_LOG_ERROR, 0,

diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c

index 73a11a3..54a7bd1 100644

--- a/xlators/mgmt/glusterd/src/glusterd-sm.c

+++ b/xlators/mgmt/glusterd/src/glusterd-sm.c

@@ -955,7 +955,7 @@ glusterd_ac_handle_friend_add_req(glusterd_friend_sm_event_t *event, void *ctx)

         /* Compare missed_snapshot list with the peer *

          * if volume comparison is successful */

-        if ((op_ret == 0) && (conf->op_version >= GD_OP_VERSION_3_6_0)) {

+        if ((op_ret == 0) && (conf->op_version >= GD_OP_VERSION_RHS_3_0)) {

             ret = glusterd_import_friend_missed_snap_list(ev_ctx->vols);

             if (ret) {

                 gf_msg(this->name, GF_LOG_ERROR, 0,

diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c

index 1ece374..2958443 100644

--- a/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c

+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c

@@ -470,7 +470,7 @@ gd_add_brick_snap_details_to_dict(dict_t *dict, char *prefix,

     GF_VALIDATE_OR_GOTO(this->name, (prefix != NULL), out);

     GF_VALIDATE_OR_GOTO(this->name, (brickinfo != NULL), out);

-    if (conf->op_version < GD_OP_VERSION_3_6_0) {

+    if (conf->op_version < GD_OP_VERSION_RHS_3_0) {

         ret = 0;

         goto out;

     }

@@ -547,7 +547,7 @@ gd_add_vol_snap_details_to_dict(dict_t *dict, char *prefix,

     GF_VALIDATE_OR_GOTO(this->name, (volinfo != NULL), out);

     GF_VALIDATE_OR_GOTO(this->name, (prefix != NULL), out);

-    if (conf->op_version < GD_OP_VERSION_3_6_0) {

+    if (conf->op_version < GD_OP_VERSION_RHS_3_0) {

         ret = 0;

         goto out;

     }

@@ -846,7 +846,7 @@ gd_import_new_brick_snap_details(dict_t *dict, char *prefix,

     GF_VALIDATE_OR_GOTO(this->name, (prefix != NULL), out);

     GF_VALIDATE_OR_GOTO(this->name, (brickinfo != NULL), out);

-    if (conf->op_version < GD_OP_VERSION_3_6_0) {

+    if (conf->op_version < GD_OP_VERSION_RHS_3_0) {

         ret = 0;

         goto out;

     }

@@ -903,8 +903,8 @@ out:

  * Imports the snapshot details of a volume if required and available

  *

  * Snapshot details will be imported only if cluster.op_version is greater than

- * or equal to GD_OP_VERSION_3_6_0, the op-version from which volume snapshot is

- * supported.

+ * or equal to GD_OP_VERSION_RHS_3_0, the op-version from which volume snapshot

+ * is supported.

  */

 int

 gd_import_volume_snap_details(dict_t *dict, glusterd_volinfo_t *volinfo,

@@ -928,7 +928,7 @@ gd_import_volume_snap_details(dict_t *dict, glusterd_volinfo_t *volinfo,

     GF_VALIDATE_OR_GOTO(this->name, (prefix != NULL), out);

     GF_VALIDATE_OR_GOTO(this->name, (volname != NULL), out);

-    if (conf->op_version < GD_OP_VERSION_3_6_0) {

+    if (conf->op_version < GD_OP_VERSION_RHS_3_0) {

         ret = 0;

         goto out;

     }

diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c

index 8f5cd6d..c56be91 100644

--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c

+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c

@@ -9345,14 +9345,14 @@ glusterd_handle_snapshot_fn(rpcsvc_request_t *req)

         goto out;

     }

-    if (conf->op_version < GD_OP_VERSION_3_6_0) {

+    if (conf->op_version < GD_OP_VERSION_RHS_3_0) {

         snprintf(err_str, sizeof(err_str),

                  "Cluster operating version"

                  " is lesser than the supported version "

                  "for a snapshot");

         op_errno = EG_OPNOTSUP;

         gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_UNSUPPORTED_VERSION,

-               "%s (%d < %d)", err_str, conf->op_version, GD_OP_VERSION_3_6_0);

+               "%s (%d < %d)", err_str, conf->op_version, GD_OP_VERSION_RHS_3_0);

         ret = -1;

         goto out;

     }

diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c

index 7acea05..64447e7 100644

--- a/xlators/mgmt/glusterd/src/glusterd-store.c

+++ b/xlators/mgmt/glusterd/src/glusterd-store.c

@@ -313,7 +313,7 @@ gd_store_brick_snap_details_write(int fd, glusterd_brickinfo_t *brickinfo)

     GF_VALIDATE_OR_GOTO(this->name, (fd > 0), out);

     GF_VALIDATE_OR_GOTO(this->name, (brickinfo != NULL), out);

-    if (conf->op_version < GD_OP_VERSION_3_6_0) {

+    if (conf->op_version < GD_OP_VERSION_RHS_3_0) {

         ret = 0;

         goto out;

     }

@@ -813,7 +813,7 @@ glusterd_volume_write_snap_details(int fd, glusterd_volinfo_t *volinfo)

     GF_VALIDATE_OR_GOTO(this->name, (fd > 0), out);

     GF_VALIDATE_OR_GOTO(this->name, (volinfo != NULL), out);

-    if (conf->op_version < GD_OP_VERSION_3_6_0) {

+    if (conf->op_version < GD_OP_VERSION_RHS_3_0) {

         ret = 0;

         goto out;

     }

@@ -967,7 +967,7 @@ glusterd_volume_exclude_options_write(int fd, glusterd_volinfo_t *volinfo)

             goto out;

     }

-    if (conf->op_version >= GD_OP_VERSION_3_6_0) {

+    if (conf->op_version >= GD_OP_VERSION_RHS_3_0) {

         snprintf(buf, sizeof(buf), "%d", volinfo->disperse_count);

         ret = gf_store_save_value(fd, GLUSTERD_STORE_KEY_VOL_DISPERSE_CNT, buf);

         if (ret)

@@ -2502,7 +2502,7 @@ glusterd_store_retrieve_snapd(glusterd_volinfo_t *volinfo)

     conf = THIS->private;

     GF_ASSERT(volinfo);

-    if (conf->op_version < GD_OP_VERSION_3_6_0) {

+    if (conf->op_version < GD_OP_VERSION_RHS_3_0) {

         ret = 0;

         goto out;

     }

@@ -2510,15 +2510,16 @@ glusterd_store_retrieve_snapd(glusterd_volinfo_t *volinfo)

     /*

      * This is needed for upgrade situations. Say a volume is created with

      * older version of glusterfs and upgraded to a glusterfs version equal

-     * to or greater than GD_OP_VERSION_3_6_0. The older glusterd would not

-     * have created the snapd.info file related to snapshot daemon for user

-     * serviceable snapshots. So as part of upgrade when the new glusterd

-     * starts, as part of restore (restoring the volume to be precise), it

-     * tries to snapd related info from snapd.info file. But since there was

-     * no such file till now, the restore operation fails. Thus, to prevent

-     * it from happening check whether user serviceable snapshots features

-     * is enabled before restoring snapd. If its disabled, then simply

-     * exit by returning success (without even checking for the snapd.info).

+     * to or greater than GD_OP_VERSION_RHS_3_0. The older glusterd would

+     * not have created the snapd.info file related to snapshot daemon for

+     * user serviceable snapshots. So as part of upgrade when the new

+     * glusterd starts, as part of restore (restoring the volume to be

+     * precise), it tries to snapd related info from snapd.info file. But

+     * since there was no such file till now, the restore operation fails.

+     * Thus, to prevent it from happening check whether user serviceable

+     * snapshots features is enabled before restoring snapd. If its

+     * disbaled, then simply exit by returning success (without even

+     * checking for the snapd.info).

      */

     if (!dict_get_str_boolean(volinfo->dict, "features.uss", _gf_false)) {

diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c

index 45b221c..1741cf8 100644

--- a/xlators/mgmt/glusterd/src/glusterd-syncop.c

+++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c

@@ -1827,7 +1827,7 @@ gd_sync_task_begin(dict_t *op_ctx, rpcsvc_request_t *req)

         goto out;

     }

-    if (conf->op_version < GD_OP_VERSION_3_6_0)

+    if (conf->op_version < GD_OP_VERSION_RHS_3_0)

         cluster_lock = _gf_true;

     /* Based on the op_version, acquire a cluster or mgmt_v3 lock */

diff --git a/xlators/mgmt/glusterd/src/glusterd-tier.c b/xlators/mgmt/glusterd/src/glusterd-tier.c

index dd86cf5..4dc0d44 100644

--- a/xlators/mgmt/glusterd/src/glusterd-tier.c

+++ b/xlators/mgmt/glusterd/src/glusterd-tier.c