From 804ac051cc8be7ff0bf0791c0b53db04edce0926 Mon Sep 17 00:00:00 2001

From: Kaushal M <kmadappa@redhat.com>

Date: Thu, 11 Jun 2015 18:21:17 +0530

Subject: [PATCH 02/74] 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/globals.h                         |  45 +++--

 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          |   2 +-

 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    | 198 +++++++++++----------

 17 files changed, 193 insertions(+), 179 deletions(-)

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

index 365183d..bd7cffe 100644

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

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

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

 #define GD_MIN_OP_VERSION_KEY "minimum-operating-version"

 #define GD_MAX_OP_VERSION_KEY "maximum-operating-version"

-/* 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

                                 should not change */

@@ -44,7 +49,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 */

@@ -90,8 +101,6 @@

 #define GD_OP_VERSION_3_12_2   31202 /* Op-version for GlusterFS 3.12.2 */

-#define GD_OP_VER_PERSISTENT_AFR_XATTRS GD_OP_VERSION_3_6_0

-

 #include "xlator.h"

 /* THIS */

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

index 6d17ff4..e88fa3f 100644

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

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

@@ -1379,7 +1379,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);

@@ -1926,7 +1926,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);

@@ -2266,12 +2266,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 "

                                            "more connected clients of a version"

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

index 185186a..af9a796 100644

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

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

@@ -754,7 +754,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,

@@ -804,7 +804,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;

@@ -836,7 +836,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,

@@ -4313,11 +4313,11 @@ __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;

         }

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

                 snprintf (err_str, sizeof (err_str), "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;

         }

@@ -6287,7 +6287,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 7bb3d53..6d5b8cf 100644

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

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

@@ -191,7 +191,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);

@@ -1824,11 +1824,11 @@ 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;

         }

@@ -3872,7 +3872,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) {

@@ -3983,7 +3983,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) {

@@ -5010,7 +5010,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

                  */

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

                          }

                  }

                  glusterd_volinfo_find (volname, &volinfo);

-                 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);

@@ -5670,7 +5670,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 cant/shouldnt 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 31f9e87..592aa16 100644

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

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

@@ -554,7 +554,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,

@@ -609,7 +609,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;

         }

@@ -799,7 +799,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;

         }

@@ -913,7 +913,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 fcafb5b..76191c4 100644

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

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

@@ -678,13 +678,13 @@ glusterd_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 "

                                            "more connected clients of a version"

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

index 08a6df0..18fc741 100644

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

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

@@ -305,7 +305,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

                  */

@@ -389,7 +389,7 @@ glusterd_op_perform_replace_brick (glusterd_volinfo_t  *volinfo,

         /* 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_str (dict, "brick1.mount_dir", &brick_mount_dir);

                 if (ret) {

                         gf_msg (this->name, GF_LOG_ERROR, errno,

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

index ab52e8d..86e1256 100644

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

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

@@ -302,11 +302,11 @@ __glusterd_probe_cbk (struct rpc_req *req, struct iovec *iov,

          * 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

@@ -1591,7 +1591,7 @@ glusterd_rpc_friend_add (call_frame_t *frame, xlator_t *this,

                 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 f83e851..6c56837 100644

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

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

@@ -942,7 +942,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)) {

+            (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 9e2a75f..6fb49c3 100644

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

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

@@ -468,7 +468,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;

         }

@@ -550,7 +550,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;

         }

@@ -878,7 +878,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;

         }

@@ -939,8 +939,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,

@@ -962,7 +962,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 31f4d95..6306d29 100644

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

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

@@ -9341,7 +9341,7 @@ 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");

@@ -9349,7 +9349,7 @@ glusterd_handle_snapshot_fn (rpcsvc_request_t *req)

                 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);

+                        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 4d22b63..229391a 100644

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

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

@@ -302,7 +302,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;

         }

@@ -799,7 +799,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;

         }

@@ -968,7 +968,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,

@@ -2339,7 +2339,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;

         }

@@ -2347,15 +2347,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 disbaled, 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 4be3d97..066c7f9 100644

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

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

@@ -1863,7 +1863,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 45f6ac3..28f02e75 100644

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

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

@@ -921,7 +921,7 @@ glusterd_op_stage_tier (dict_t *dict, char **op_errstr, dict_t *rsp_dict)

          * 'force'

          */

         ret = glusterd_check_client_op_version_support

-                (volname, GD_OP_VERSION_3_6_0, NULL);

+                (volname, GD_OP_VERSION_RHS_3_0, NULL);

         if (ret) {

                 ret = gf_asprintf (op_errstr, "Volume %s has one or "

                                    "more connected clients of a version"

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

index e38f963..f34e218 100644

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

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

@@ -11758,10 +11758,10 @@ gd_update_volume_op_versions (glusterd_volinfo_t *volinfo)

         }

         if (volinfo->type == GF_CLUSTER_TYPE_DISPERSE) {

-                if (volinfo->op_version < GD_OP_VERSION_3_6_0)

-                        volinfo->op_version = GD_OP_VERSION_3_6_0;

-                if (volinfo->client_op_version < GD_OP_VERSION_3_6_0)

-                        volinfo->client_op_version = GD_OP_VERSION_3_6_0;

+                if (volinfo->op_version < GD_OP_VERSION_3_7_0)

+                        volinfo->op_version = GD_OP_VERSION_3_7_0;

+                if (volinfo->client_op_version < GD_OP_VERSION_3_7_0)

+                        volinfo->client_op_version = GD_OP_VERSION_3_7_0;

         }

         return;

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

index 9d34073..834acab 100644

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

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

@@ -1325,7 +1325,7 @@ glusterd_op_stage_create_volume (dict_t *dict, char **op_errstr,

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

                          * introduced in gluster-3.6.0

                          */

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

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

                                 ret = glusterd_get_brick_mount_dir

                                         (brick_info->path, brick_info->hostname,

                                          brick_info->mount_dir);

@@ -1611,7 +1611,7 @@ glusterd_op_stage_start_volume (dict_t *dict, char **op_errstr,

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

                  * introduced in gluster-3.6.0

                  */

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

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

                         if (strlen(brickinfo->mount_dir) < 1) {

                                 ret = glusterd_get_brick_mount_dir

                                         (brickinfo->path, brickinfo->hostname,

@@ -2320,10 +2320,10 @@ glusterd_op_create_volume (dict_t *dict, char **op_errstr)

                                  "redundancy count for volume %s", volname);

                         goto out;

                 }

-                if (priv->op_version < GD_OP_VERSION_3_6_0) {

+                if (priv->op_version < GD_OP_VERSION_3_7_0) {

                         gf_msg (this->name, GF_LOG_ERROR, 0,

                                 GD_MSG_UNSUPPORTED_VERSION, "Disperse volume "

-                                "needs op-version 3.6.0 or higher");

+                                "needs op-version 30700 or higher");

                         ret = -1;

                         goto out;

                 }

@@ -2428,7 +2428,7 @@ glusterd_op_create_volume (dict_t *dict, char **op_errstr)

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

                  * introduced in gluster-3.6.0

                  */

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

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

                         brick_mount_dir = NULL;

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

                         ret = dict_get_str (dict, key, &brick_mount_dir);

@@ -2623,7 +2623,7 @@ glusterd_op_start_volume (dict_t *dict, char **op_errstr)

         /* 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) {

                 cds_list_for_each_entry (brickinfo, &volinfo->bricks,

                                          brick_list) {

                         brick_count++;

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

index 14b9e21..982275e 100644

--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c

+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c

@@ -1263,7 +1263,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {

         { .key         = "cluster.subvols-per-directory",

           .voltype     = "cluster/distribute",

           .option      = "directory-layout-spread",

-          .op_version  = 2,

+          .op_version  = 1,

           .validate_fn = validate_subvols_per_directory,

           .flags       = OPT_FLAG_CLIENT_OPT

         },

@@ -1275,27 +1275,27 @@ struct volopt_map_entry glusterd_volopt_map[] = {

         { .key        = "cluster.rsync-hash-regex",

           .voltype    = "cluster/distribute",

           .type       = NO_DOC,

-          .op_version = 3,

+          .op_version = 2,

           .flags      = OPT_FLAG_CLIENT_OPT

         },

         { .key        = "cluster.extra-hash-regex",

           .voltype    = "cluster/distribute",

           .type       = NO_DOC,

-          .op_version = 3,

+          .op_version = 2,

           .flags      = OPT_FLAG_CLIENT_OPT

         },

         { .key        = "cluster.dht-xattr-name",

           .voltype    = "cluster/distribute",

           .option     = "xattr-name",

           .type       = NO_DOC,

-          .op_version = 3,

+          .op_version = 2,

           .flags      = OPT_FLAG_CLIENT_OPT

         },

         { .key        = "cluster.randomize-hash-range-by-gfid",

           .voltype    = "cluster/distribute",

           .option     = "randomize-hash-range-by-gfid",

           .type       = NO_DOC,

-          .op_version = GD_OP_VERSION_3_6_0,

+          .op_version = GD_OP_VERSION_3_7_0,

           .flags      = OPT_FLAG_CLIENT_OPT,

         },

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

@@ -1327,12 +1327,12 @@ struct volopt_map_entry glusterd_volopt_map[] = {

           .voltype    = "cluster/nufa",

           .option     = "local-volume-name",

           .type       = NO_DOC,

-          .op_version = 3,

+          .op_version = GD_OP_VERSION_RHS_3_0,

           .flags      = OPT_FLAG_CLIENT_OPT

         },

         { .key        = "cluster.weighted-rebalance",

           .voltype    = "cluster/distribute",

-          .op_version = GD_OP_VERSION_3_6_0,

+          .op_version = GD_OP_VERSION_3_7_0,

         },

         /* Switch xlator options (Distribute special case) */

@@ -1340,14 +1340,14 @@ struct volopt_map_entry glusterd_volopt_map[] = {

           .voltype    = "cluster/distribute",

           .option     = "!switch",

           .type       = NO_DOC,

-          .op_version = 3,

+          .op_version = GD_OP_VERSION_RHS_3_0,

           .flags      = OPT_FLAG_CLIENT_OPT

         },

         { .key        = "cluster.switch-pattern",

           .voltype    = "cluster/switch",

           .option     = "pattern.switch.case",

           .type       = NO_DOC,

-          .op_version = 3,

+          .op_version = GD_OP_VERSION_RHS_3_0,

           .flags      = OPT_FLAG_CLIENT_OPT

         },

@@ -1475,18 +1475,18 @@ struct volopt_map_entry glusterd_volopt_map[] = {