3604df
From 871addd0495680e6b6406c385a0415528330ac80 Mon Sep 17 00:00:00 2001
cb8e9e
From: Kaushal M <kmadappa@redhat.com>
cb8e9e
Date: Thu, 11 Jun 2015 18:21:17 +0530
3604df
Subject: [PATCH 02/86] glusterd: fix op-versions for RHS backwards compatability
cb8e9e
12a457
Backport of https://code.engineering.redhat.com/gerrit/#/c/60485/
cb8e9e
12a457
This change fixes the op-version of different features and checks to maintain
12a457
backwards compatability with RHS-3.0 and before.
12a457
12a457
Label: DOWNSTREAM ONLY
12a457
12a457
Change-Id: Icb282444da179b12fbd6ed9f491514602f1a38c2
12a457
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
12a457
Reviewed-on: https://code.engineering.redhat.com/gerrit/70348
cb8e9e
---
3604df
 libglusterfs/src/globals.h                         |   45 +++--
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-brick-ops.c     |    8 +-
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-handler.c       |   12 +-
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-op-sm.c         |   16 +-
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-peer-utils.c    |    8 +-
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-rebalance.c     |    4 +-
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-replace-brick.c |    4 +-
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-rpc-ops.c       |    6 +-
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-sm.c            |    2 +-
cb8e9e
 .../mgmt/glusterd/src/glusterd-snapshot-utils.c    |   12 +-
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-snapshot.c      |    4 +-
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-store.c         |   25 ++--
12a457
 xlators/mgmt/glusterd/src/glusterd-syncop.c        |    2 +-
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-utils.c         |    8 +-
cb8e9e
 xlators/mgmt/glusterd/src/glusterd-volume-ops.c    |   12 +-
3604df
 xlators/mgmt/glusterd/src/glusterd-volume-set.c    |  184 ++++++++++----------
3604df
 16 files changed, 181 insertions(+), 171 deletions(-)
cb8e9e
cb8e9e
diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h
3604df
index c656bbf..5853e46 100644
cb8e9e
--- a/libglusterfs/src/globals.h
cb8e9e
+++ b/libglusterfs/src/globals.h
3604df
@@ -18,23 +18,28 @@
cb8e9e
 #define GD_MIN_OP_VERSION_KEY "minimum-operating-version"
cb8e9e
 #define GD_MAX_OP_VERSION_KEY "maximum-operating-version"
cb8e9e
 
cb8e9e
-/* Gluster versions - OP-VERSION mapping
cb8e9e
+/* RHS versions - OP-VERSION mapping
cb8e9e
  *
cb8e9e
- * 3.3.x                - 1
cb8e9e
- * 3.4.x                - 2
cb8e9e
- * 3.5.0                - 3
cb8e9e
- * 3.5.1                - 30501
cb8e9e
- * 3.6.0                - 30600
cb8e9e
- * 3.7.0                - 30700
cb8e9e
- * 3.7.1                - 30701
cb8e9e
- * 3.7.2                - 30702
cb8e9e
+ * RHS-2.0 Z    - 1
cb8e9e
+ * RHS-2.1 Z    - 2
cb8e9e
+ * RHS-2.1 u5   - 20105
cb8e9e
+ * RHS-3.0      - 30000
cb8e9e
+ * RHS-3.0.4    - 30004
cb8e9e
+ * RHGS-3.1     - 30702
cb8e9e
  *
cb8e9e
- * Starting with Gluster v3.6, the op-version will be multi-digit integer values
cb8e9e
- * based on the Glusterfs version, instead of a simply incrementing integer
cb8e9e
- * value. The op-version for a given X.Y.Z release will be an integer XYZ, with
cb8e9e
- * Y and Z 2 digit always 2 digits wide and padded with 0 when needed. This
cb8e9e
- * should allow for some gaps between two Y releases for backports of features
cb8e9e
- * in Z releases.
cb8e9e
+ *
cb8e9e
+ * NOTE:
cb8e9e
+ * Starting with RHS-3.0, the op-version will be multi-digit integer values
cb8e9e
+ * based on the RHS version, instead of a simply incrementing integer value. The
cb8e9e
+ * op-version for a given RHS X(Major).Y(Minor).Z(Update) release will be an
cb8e9e
+ * integer with digits XYZ. The Y and Z values will be 2 digits wide always
cb8e9e
+ * padded with 0 as needed. This should allow for some gaps between two Y
cb8e9e
+ * releases for backports of features in Z releases.
cb8e9e
+ *
cb8e9e
+ * NOTE:
cb8e9e
+ * Starting with RHGS-3.1, the op-version will be the same as the upstream
cb8e9e
+ * GlusterFS op-versions. This is to allow proper access to upstream clients of
cb8e9e
+ * version 3.7.x or greater, proper access to the RHGS volumes.
cb8e9e
  */
cb8e9e
 #define GD_OP_VERSION_MIN  1 /* MIN is the fresh start op-version, mostly
cb8e9e
                                 should not change */
3604df
@@ -44,7 +49,13 @@
12a457
                                                   introduction of newer
12a457
                                                   versions */
cb8e9e
 
cb8e9e
-#define GD_OP_VERSION_3_6_0    30600 /* Op-Version for GlusterFS 3.6.0 */
cb8e9e
+#define GD_OP_VERSION_RHS_3_0    30000 /* Op-Version of RHS 3.0 */
cb8e9e
+
cb8e9e
+#define GD_OP_VER_PERSISTENT_AFR_XATTRS GD_OP_VERSION_RHS_3_0
cb8e9e
+
cb8e9e
+#define GD_OP_VERSION_RHS_2_1_5  20105 /* RHS 2.1 update 5 */
cb8e9e
+
cb8e9e
+#define GD_OP_VERSION_RHS_3_0_4  30004 /* Op-Version of RHS 3.0.4 */
cb8e9e
 
cb8e9e
 #define GD_OP_VERSION_3_7_0    30700 /* Op-version for GlusterFS 3.7.0 */
cb8e9e
 
3604df
@@ -68,8 +79,6 @@
3604df
 
3604df
 #define GD_OP_VERSION_3_8_0    30800 /* Op-version for GlusterFS 3.8.0 */
3604df
 
3604df
-#define GD_OP_VER_PERSISTENT_AFR_XATTRS GD_OP_VERSION_3_6_0
3604df
-
3604df
 #include "xlator.h"
3604df
 
3604df
 /* THIS */
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
3604df
index a90114a..7522003 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
3604df
@@ -1377,7 +1377,7 @@ glusterd_op_perform_add_bricks (glusterd_volinfo_t *volinfo, int32_t count,
cb8e9e
                 /* A bricks mount dir is required only by snapshots which were
cb8e9e
                  * introduced in gluster-3.6.0
cb8e9e
                  */
cb8e9e
-                if (conf->op_version >= GD_OP_VERSION_3_6_0) {
cb8e9e
+                if (conf->op_version >= GD_OP_VERSION_RHS_3_0) {
cb8e9e
                         brick_mount_dir = NULL;
cb8e9e
 
cb8e9e
                         snprintf (key, sizeof(key), "brick%d.mount_dir", i);
3604df
@@ -1860,7 +1860,7 @@ glusterd_op_stage_add_brick (dict_t *dict, char **op_errstr, dict_t *rsp_dict)
cb8e9e
                         /* A bricks mount dir is required only by snapshots which were
cb8e9e
                          * introduced in gluster-3.6.0
cb8e9e
                          */
cb8e9e
-                        if (conf->op_version >= GD_OP_VERSION_3_6_0) {
cb8e9e
+                        if (conf->op_version >= GD_OP_VERSION_RHS_3_0) {
cb8e9e
                                 ret = glusterd_get_brick_mount_dir
cb8e9e
                                         (brickinfo->path, brickinfo->hostname,
cb8e9e
                                          brickinfo->mount_dir);
3604df
@@ -2162,12 +2162,12 @@ glusterd_op_stage_remove_brick (dict_t *dict, char **op_errstr)
cb8e9e
                 }
cb8e9e
 
cb8e9e
                 /* Check if the connected clients are all of version
cb8e9e
-                 * glusterfs-3.6 and higher. This is needed to prevent some data
cb8e9e
+                 * RHS-2.1u5 and higher. This is needed to prevent some data
cb8e9e
                  * loss issues that could occur when older clients are connected
cb8e9e
                  * when rebalance is run.
cb8e9e
                  */
cb8e9e
                 ret = glusterd_check_client_op_version_support
cb8e9e
-                        (volname, GD_OP_VERSION_3_6_0, NULL);
cb8e9e
+                        (volname, GD_OP_VERSION_RHS_2_1_5, NULL);
cb8e9e
                 if (ret) {
cb8e9e
                         ret = gf_asprintf (op_errstr, "Volume %s has one or "
cb8e9e
                                            "more connected clients of a version"
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
3604df
index bf62290..8ca9d2a 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
3604df
@@ -752,7 +752,7 @@ glusterd_op_txn_begin (rpcsvc_request_t *req, glusterd_op_t op, void *ctx,
cb8e9e
         }
cb8e9e
 
cb8e9e
         /* Based on the op_version, acquire a cluster or mgmt_v3 lock */
cb8e9e
-        if (priv->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (priv->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 ret = glusterd_lock (MY_UUID);
cb8e9e
                 if (ret) {
12a457
                         gf_msg (this->name, GF_LOG_ERROR, 0,
3604df
@@ -802,7 +802,7 @@ glusterd_op_txn_begin (rpcsvc_request_t *req, glusterd_op_t op, void *ctx,
cb8e9e
 local_locking_done:
cb8e9e
         /* If no volname is given as a part of the command, locks will
cb8e9e
          * not be held, hence sending stage event. */
cb8e9e
-        if (volname || (priv->op_version < GD_OP_VERSION_3_6_0))
cb8e9e
+        if (volname || (priv->op_version < GD_OP_VERSION_RHS_3_0))
cb8e9e
                 event_type = GD_OP_EVENT_START_LOCK;
cb8e9e
         else {
cb8e9e
                 txn_op_info.state.state = GD_OP_STATE_LOCK_SENT;
3604df
@@ -834,7 +834,7 @@ out:
cb8e9e
         if (locked && ret) {
cb8e9e
                 /* Based on the op-version, we release the
cb8e9e
                  * cluster or mgmt_v3 lock */
cb8e9e
-                if (priv->op_version < GD_OP_VERSION_3_6_0)
cb8e9e
+                if (priv->op_version < GD_OP_VERSION_RHS_3_0)
cb8e9e
                         glusterd_unlock (MY_UUID);
cb8e9e
                 else {
cb8e9e
                         ret = glusterd_mgmt_v3_unlock (volname, MY_UUID,
3604df
@@ -4359,11 +4359,11 @@ __glusterd_handle_status_volume (rpcsvc_request_t *req)
cb8e9e
         }
cb8e9e
 
cb8e9e
         if ((cmd & GF_CLI_STATUS_SNAPD) &&
cb8e9e
-            (conf->op_version < GD_OP_VERSION_3_6_0)) {
cb8e9e
+            (conf->op_version < GD_OP_VERSION_RHS_3_0)) {
cb8e9e
                 snprintf (err_str, sizeof (err_str), "The cluster is operating "
cb8e9e
                           "at a lesser version than %d. Getting the status of "
cb8e9e
                           "snapd is not allowed in this state",
cb8e9e
-                          GD_OP_VERSION_3_6_0);
cb8e9e
+                          GD_OP_VERSION_RHS_3_0);
cb8e9e
                 ret = -1;
cb8e9e
                 goto out;
cb8e9e
         }
3604df
@@ -5219,7 +5219,7 @@ __glusterd_peer_rpc_notify (struct rpc_clnt *rpc, void *mydata,
cb8e9e
                         glusterd_friend_sm_state_name_get (peerinfo->state.state));
cb8e9e
 
cb8e9e
                 if (peerinfo->connected) {
cb8e9e
-                        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+                        if (conf->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                                 glusterd_get_lock_owner (&uuid);
cb8e9e
                                 if (!gf_uuid_is_null (uuid) &&
cb8e9e
                                     !gf_uuid_compare (peerinfo->uuid, uuid))
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
3604df
index e9f261c..9194077 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
3604df
@@ -192,7 +192,7 @@ glusterd_generate_txn_id (dict_t *dict, uuid_t **txn_id)
cb8e9e
         if (!*txn_id)
cb8e9e
                 goto out;
cb8e9e
 
cb8e9e
-        if (priv->op_version < GD_OP_VERSION_3_6_0)
cb8e9e
+        if (priv->op_version < GD_OP_VERSION_RHS_3_0)
cb8e9e
                 gf_uuid_copy (**txn_id, priv->global_txn_id);
cb8e9e
         else
cb8e9e
                 gf_uuid_generate (**txn_id);
3604df
@@ -1621,11 +1621,11 @@ glusterd_op_stage_status_volume (dict_t *dict, char **op_errstr)
cb8e9e
         }
cb8e9e
 
cb8e9e
         if ((cmd & GF_CLI_STATUS_SNAPD) &&
cb8e9e
-            (priv->op_version < GD_OP_VERSION_3_6_0)) {
cb8e9e
+            (priv->op_version < GD_OP_VERSION_RHS_3_0)) {
cb8e9e
                 snprintf (msg, sizeof (msg), "The cluster is operating at "
cb8e9e
                           "version less than %d. Getting the "
cb8e9e
                           "status of snapd is not allowed in this state.",
cb8e9e
-                          GD_OP_VERSION_3_6_0);
cb8e9e
+                          GD_OP_VERSION_RHS_3_0);
cb8e9e
                 ret = -1;
cb8e9e
                 goto out;
cb8e9e
         }
3604df
@@ -3475,7 +3475,7 @@ glusterd_op_ac_send_lock (glusterd_op_sm_event_t *event, void *ctx)
cb8e9e
                         continue;
cb8e9e
 
cb8e9e
                 /* Based on the op_version, acquire a cluster or mgmt_v3 lock */
cb8e9e
-                if (priv->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+                if (priv->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                         proc = &peerinfo->mgmt->proctable
cb8e9e
                                           [GLUSTERD_MGMT_CLUSTER_LOCK];
cb8e9e
                         if (proc->fn) {
3604df
@@ -3586,7 +3586,7 @@ glusterd_op_ac_send_unlock (glusterd_op_sm_event_t *event, void *ctx)
cb8e9e
                         continue;
cb8e9e
                 /* Based on the op_version,
cb8e9e
                  * release the cluster or mgmt_v3 lock */
cb8e9e
-                if (priv->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+                if (priv->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                         proc = &peerinfo->mgmt->proctable
cb8e9e
                                           [GLUSTERD_MGMT_CLUSTER_UNLOCK];
cb8e9e
                         if (proc->fn) {
3604df
@@ -4612,7 +4612,7 @@ glusterd_op_modify_op_ctx (glusterd_op_t op, void *ctx)
cb8e9e
                 count = brick_index_max + other_count + 1;
cb8e9e
 
cb8e9e
                 /*
cb8e9e
-                 * a glusterd lesser than version 3.7 will be sending the
cb8e9e
+                 * a glusterd lesser than version RHS-3.0.4 will be sending the
cb8e9e
                  * rdma port in older key. Changing that value from here
cb8e9e
                  * to support backward compatibility
cb8e9e
                  */
3604df
@@ -4631,7 +4631,7 @@ glusterd_op_modify_op_ctx (glusterd_op_t op, void *ctx)
12a457
                          }
12a457
                  }
cb8e9e
                  glusterd_volinfo_find (volname, &volinfo);
cb8e9e
-                 if (conf->op_version < GD_OP_VERSION_3_7_0 &&
cb8e9e
+                 if (conf->op_version < GD_OP_VERSION_RHS_3_0_4 &&
cb8e9e
                      volinfo->transport_type == GF_TRANSPORT_RDMA) {
cb8e9e
                          ret = glusterd_op_modify_port_key (op_ctx,
cb8e9e
                                                             brick_index_max);
3604df
@@ -5267,7 +5267,7 @@ glusterd_op_txn_complete (uuid_t *txn_id)
cb8e9e
         glusterd_op_clear_errstr ();
cb8e9e
 
cb8e9e
         /* Based on the op-version, we release the cluster or mgmt_v3 lock */
cb8e9e
-        if (priv->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (priv->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 ret = glusterd_unlock (MY_UUID);
cb8e9e
                 /* unlock cant/shouldnt fail here!! */
cb8e9e
                 if (ret)
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c
3604df
index 4131296..72d6b17 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c
3604df
@@ -555,7 +555,7 @@ out:
cb8e9e
  * @prefix. All the parameters are compulsory.
cb8e9e
  *
cb8e9e
  * The complete address list is added to the dict only if the cluster op-version
cb8e9e
- * is >= GD_OP_VERSION_3_6_0
cb8e9e
+ * is >= GD_OP_VERSION_3_7_0
cb8e9e
  */
cb8e9e
 int
cb8e9e
 gd_add_friend_to_dict (glusterd_peerinfo_t *friend, dict_t *dict,
3604df
@@ -610,7 +610,7 @@ gd_add_friend_to_dict (glusterd_peerinfo_t *friend, dict_t *dict,
cb8e9e
                 goto out;
cb8e9e
         }
cb8e9e
 
cb8e9e
-        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version < GD_OP_VERSION_3_7_0) {
cb8e9e
                 ret = 0;
cb8e9e
                 goto out;
cb8e9e
         }
3604df
@@ -800,7 +800,7 @@ gd_update_peerinfo_from_dict (glusterd_peerinfo_t *peerinfo, dict_t *dict,
cb8e9e
                 GF_FREE (peerinfo->hostname);
cb8e9e
         peerinfo->hostname = gf_strdup (hostname);
cb8e9e
 
cb8e9e
-        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version < GD_OP_VERSION_3_7_0) {
cb8e9e
                 ret = 0;
cb8e9e
                 goto out;
cb8e9e
         }
3604df
@@ -914,7 +914,7 @@ gd_add_peer_hostnames_to_dict (glusterd_peerinfo_t *peerinfo, dict_t *dict,
cb8e9e
         conf = this->private;
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (conf != NULL), out);
cb8e9e
 
cb8e9e
-        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version < GD_OP_VERSION_3_7_0) {
cb8e9e
                 ret = 0;
cb8e9e
                 goto out;
cb8e9e
         }
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
3604df
index 35fa462..9ecbdfb 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
3604df
@@ -683,13 +683,13 @@ glusterd_op_stage_rebalance (dict_t *dict, char **op_errstr)
12a457
         case GF_DEFRAG_CMD_START:
cb8e9e
         case GF_DEFRAG_CMD_START_LAYOUT_FIX:
cb8e9e
                 /* Check if the connected clients are all of version
cb8e9e
-                 * glusterfs-3.6 and higher. This is needed to prevent some data
cb8e9e
+                 * RHS-2.1u5 and higher. This is needed to prevent some data
cb8e9e
                  * loss issues that could occur when older clients are connected
cb8e9e
                  * when rebalance is run. This check can be bypassed by using
cb8e9e
                  * 'force'
cb8e9e
                  */
cb8e9e
                 ret = glusterd_check_client_op_version_support
cb8e9e
-                        (volname, GD_OP_VERSION_3_6_0, NULL);
cb8e9e
+                        (volname, GD_OP_VERSION_RHS_2_1_5, NULL);
cb8e9e
                 if (ret) {
cb8e9e
                         ret = gf_asprintf (op_errstr, "Volume %s has one or "
cb8e9e
                                            "more connected clients of a version"
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
3604df
index 2b21207..7bd1de3 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
3604df
@@ -432,7 +432,7 @@ glusterd_op_stage_replace_brick (dict_t *dict, char **op_errstr,
cb8e9e
                 if (ret)
cb8e9e
                         goto out;
cb8e9e
 
cb8e9e
-        } else if (priv->op_version >= GD_OP_VERSION_3_6_0) {
cb8e9e
+        } else if (priv->op_version >= GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 /* A bricks mount dir is required only by snapshots which were
cb8e9e
                  * introduced in gluster-3.6.0
cb8e9e
                  */
3604df
@@ -572,7 +572,7 @@ glusterd_op_perform_replace_brick (glusterd_volinfo_t  *volinfo,
cb8e9e
         /* A bricks mount dir is required only by snapshots which were
cb8e9e
          * introduced in gluster-3.6.0
cb8e9e
          */
cb8e9e
-        if (conf->op_version >= GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version >= GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 ret = dict_get_str (dict, "brick1.mount_dir", &brick_mount_dir);
cb8e9e
                 if (ret) {
12a457
                         gf_msg (this->name, GF_LOG_ERROR, errno,
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
3604df
index 890ccf0..d37a8f2 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
3604df
@@ -292,11 +292,11 @@ __glusterd_probe_cbk (struct rpc_req *req, struct iovec *iov,
cb8e9e
          * we need to add the new hostname to the peer.
cb8e9e
          *
cb8e9e
          * This addition should only be done for cluster op-version >=
cb8e9e
-         * GD_OP_VERSION_3_6_0 as address lists are only supported from then on.
cb8e9e
+         * GD_OP_VERSION_3_7_0 as address lists are only supported from then on.
cb8e9e
          * Also, this update should only be done when an explicit CLI probe
cb8e9e
          * command was used to begin the probe process.
cb8e9e
          */
cb8e9e
-        if ((conf->op_version >= GD_OP_VERSION_3_6_0) &&
cb8e9e
+        if ((conf->op_version >= GD_OP_VERSION_3_7_0) &&
cb8e9e
             (gf_uuid_compare (rsp.uuid, peerinfo->uuid) == 0)) {
cb8e9e
                 ctx = ((call_frame_t *)myframe)->local;
cb8e9e
                 /* Presence of ctx->req implies this probe was started by a cli
3604df
@@ -1583,7 +1583,7 @@ glusterd_rpc_friend_add (call_frame_t *frame, xlator_t *this,
cb8e9e
                 goto out;
cb8e9e
         }
cb8e9e
 
cb8e9e
-        if (priv->op_version >= GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (priv->op_version >= GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 ret = glusterd_add_missed_snaps_to_export_dict (peer_data);
cb8e9e
                 if (ret) {
12a457
                         gf_msg (this->name, GF_LOG_ERROR, 0,
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c
3604df
index c1fb318..2925788 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-sm.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-sm.c
3604df
@@ -933,7 +933,7 @@ glusterd_ac_handle_friend_add_req (glusterd_friend_sm_event_t *event, void *ctx)
cb8e9e
         /* Compare missed_snapshot list with the peer *
cb8e9e
          * if volume comparison is successful */
cb8e9e
         if ((op_ret == 0) &&
cb8e9e
-            (conf->op_version >= GD_OP_VERSION_3_6_0)) {
cb8e9e
+            (conf->op_version >= GD_OP_VERSION_RHS_3_0)) {
cb8e9e
                 ret = glusterd_import_friend_missed_snap_list (ev_ctx->vols);
cb8e9e
                 if (ret) {
12a457
                         gf_msg (this->name, GF_LOG_ERROR, 0,
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c
3604df
index 36adb7f..a4660c7 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c
3604df
@@ -468,7 +468,7 @@ gd_add_brick_snap_details_to_dict (dict_t *dict, char *prefix,
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (prefix != NULL), out);
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (brickinfo != NULL), out);
cb8e9e
 
cb8e9e
-        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 ret = 0;
cb8e9e
                 goto out;
cb8e9e
         }
3604df
@@ -550,7 +550,7 @@ gd_add_vol_snap_details_to_dict (dict_t *dict, char *prefix,
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (volinfo != NULL), out);
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (prefix != NULL), out);
cb8e9e
 
cb8e9e
-        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 ret = 0;
cb8e9e
                 goto out;
cb8e9e
         }
3604df
@@ -878,7 +878,7 @@ gd_import_new_brick_snap_details (dict_t *dict, char *prefix,
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (prefix != NULL), out);
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (brickinfo != NULL), out);
cb8e9e
 
cb8e9e
-        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 ret = 0;
cb8e9e
                 goto out;
cb8e9e
         }
3604df
@@ -939,8 +939,8 @@ out:
cb8e9e
  * Imports the snapshot details of a volume if required and available
cb8e9e
  *
cb8e9e
  * Snapshot details will be imported only if cluster.op_version is greater than
cb8e9e
- * or equal to GD_OP_VERSION_3_6_0, the op-version from which volume snapshot is
cb8e9e
- * supported.
cb8e9e
+ * or equal to GD_OP_VERSION_RHS_3_0, the op-version from which volume snapshot
cb8e9e
+ * is supported.
cb8e9e
  */
cb8e9e
 int
cb8e9e
 gd_import_volume_snap_details (dict_t *dict, glusterd_volinfo_t *volinfo,
3604df
@@ -962,7 +962,7 @@ gd_import_volume_snap_details (dict_t *dict, glusterd_volinfo_t *volinfo,
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (prefix != NULL), out);
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (volname != NULL), out);
cb8e9e
 
cb8e9e
-        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 ret = 0;
cb8e9e
                 goto out;
cb8e9e
         }
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
3604df
index 6e4894b..85f2a3f 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
3604df
@@ -9219,7 +9219,7 @@ glusterd_handle_snapshot_fn (rpcsvc_request_t *req)
cb8e9e
                 goto out;
cb8e9e
         }
cb8e9e
 
cb8e9e
-        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 snprintf (err_str, sizeof (err_str), "Cluster operating version"
cb8e9e
                           " is lesser than the supported version "
cb8e9e
                           "for a snapshot");
3604df
@@ -9227,7 +9227,7 @@ glusterd_handle_snapshot_fn (rpcsvc_request_t *req)
cb8e9e
                 gf_msg (this->name, GF_LOG_ERROR, 0,
cb8e9e
                         GD_MSG_UNSUPPORTED_VERSION,
cb8e9e
                         "%s (%d < %d)", err_str,
cb8e9e
-                        conf->op_version, GD_OP_VERSION_3_6_0);
cb8e9e
+                        conf->op_version, GD_OP_VERSION_RHS_3_0);
cb8e9e
                 ret = -1;
cb8e9e
                 goto out;
cb8e9e
         }
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
3604df
index 8cf3b5d..5a86aee 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
3604df
@@ -306,7 +306,7 @@ gd_store_brick_snap_details_write (int fd, glusterd_brickinfo_t *brickinfo)
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (fd > 0), out);
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (brickinfo != NULL), out);
cb8e9e
 
cb8e9e
-        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 ret = 0;
cb8e9e
                 goto out;
cb8e9e
         }
3604df
@@ -792,7 +792,7 @@ glusterd_volume_write_snap_details (int fd, glusterd_volinfo_t *volinfo)
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (fd > 0), out);
cb8e9e
         GF_VALIDATE_OR_GOTO (this->name, (volinfo != NULL), out);
cb8e9e
 
cb8e9e
-        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 ret = 0;
cb8e9e
                 goto out;
cb8e9e
         }
3604df
@@ -2193,7 +2193,7 @@ glusterd_store_retrieve_snapd (glusterd_volinfo_t *volinfo)
cb8e9e
         conf = THIS->private;
cb8e9e
         GF_ASSERT (volinfo);
cb8e9e
 
cb8e9e
-        if (conf->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version < GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 ret = 0;
cb8e9e
                 goto out;
cb8e9e
         }
3604df
@@ -2201,15 +2201,16 @@ glusterd_store_retrieve_snapd (glusterd_volinfo_t *volinfo)
cb8e9e
         /*
cb8e9e
          * This is needed for upgrade situations. Say a volume is created with
cb8e9e
          * older version of glusterfs and upgraded to a glusterfs version equal
cb8e9e
-         * to or greater than GD_OP_VERSION_3_6_0. The older glusterd would not
cb8e9e
-         * have created the snapd.info file related to snapshot daemon for user
cb8e9e
-         * serviceable snapshots. So as part of upgrade when the new glusterd
cb8e9e
-         * starts, as part of restore (restoring the volume to be precise), it
cb8e9e
-         * tries to snapd related info from snapd.info file. But since there was
cb8e9e
-         * no such file till now, the restore operation fails. Thus, to prevent
cb8e9e
-         * it from happening check whether user serviceable snapshots features
cb8e9e
-         * is enabled before restoring snapd. If its disbaled, then simply
cb8e9e
-         * exit by returning success (without even checking for the snapd.info).
cb8e9e
+         * to or greater than GD_OP_VERSION_RHS_3_0. The older glusterd would
cb8e9e
+         * not have created the snapd.info file related to snapshot daemon for
cb8e9e
+         * user serviceable snapshots. So as part of upgrade when the new
cb8e9e
+         * glusterd starts, as part of restore (restoring the volume to be
cb8e9e
+         * precise), it tries to snapd related info from snapd.info file. But
cb8e9e
+         * since there was no such file till now, the restore operation fails.
cb8e9e
+         * Thus, to prevent it from happening check whether user serviceable
cb8e9e
+         * snapshots features is enabled before restoring snapd. If its
cb8e9e
+         * disbaled, then simply exit by returning success (without even
cb8e9e
+         * checking for the snapd.info).
cb8e9e
          */
cb8e9e
 
cb8e9e
         if (!dict_get_str_boolean (volinfo->dict, "features.uss", _gf_false)) {
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c
3604df
index 7c5721f..a233f34 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-syncop.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c
3604df
@@ -1798,7 +1798,7 @@ gd_sync_task_begin (dict_t *op_ctx, rpcsvc_request_t * req)
12a457
                 goto out;
cb8e9e
         }
cb8e9e
 
12a457
-        if (conf->op_version < GD_OP_VERSION_3_6_0)
12a457
+        if (conf->op_version < GD_OP_VERSION_RHS_3_0)
12a457
                 cluster_lock = _gf_true;
cb8e9e
 
12a457
         /* Based on the op_version, acquire a cluster or mgmt_v3 lock */
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
3604df
index 5bfa809..46a3509 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
3604df
@@ -10228,10 +10228,10 @@ gd_update_volume_op_versions (glusterd_volinfo_t *volinfo)
cb8e9e
         }
cb8e9e
 
cb8e9e
         if (volinfo->type == GF_CLUSTER_TYPE_DISPERSE) {
cb8e9e
-                if (volinfo->op_version < GD_OP_VERSION_3_6_0)
cb8e9e
-                        volinfo->op_version = GD_OP_VERSION_3_6_0;
cb8e9e
-                if (volinfo->client_op_version < GD_OP_VERSION_3_6_0)
cb8e9e
-                        volinfo->client_op_version = GD_OP_VERSION_3_6_0;
cb8e9e
+                if (volinfo->op_version < GD_OP_VERSION_3_7_0)
cb8e9e
+                        volinfo->op_version = GD_OP_VERSION_3_7_0;
cb8e9e
+                if (volinfo->client_op_version < GD_OP_VERSION_3_7_0)
cb8e9e
+                        volinfo->client_op_version = GD_OP_VERSION_3_7_0;
cb8e9e
         }
cb8e9e
 
cb8e9e
         return;
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
3604df
index 72e14b0..2b1c50a 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
3604df
@@ -1283,7 +1283,7 @@ glusterd_op_stage_create_volume (dict_t *dict, char **op_errstr,
cb8e9e
                         /* A bricks mount dir is required only by snapshots which were
cb8e9e
                          * introduced in gluster-3.6.0
cb8e9e
                          */
cb8e9e
-                        if (priv->op_version >= GD_OP_VERSION_3_6_0) {
cb8e9e
+                        if (priv->op_version >= GD_OP_VERSION_RHS_3_0) {
cb8e9e
                                 ret = glusterd_get_brick_mount_dir
cb8e9e
                                         (brick_info->path, brick_info->hostname,
cb8e9e
                                          brick_info->mount_dir);
3604df
@@ -1569,7 +1569,7 @@ glusterd_op_stage_start_volume (dict_t *dict, char **op_errstr,
cb8e9e
                 /* A bricks mount dir is required only by snapshots which were
cb8e9e
                  * introduced in gluster-3.6.0
cb8e9e
                  */
cb8e9e
-                if (priv->op_version >= GD_OP_VERSION_3_6_0) {
cb8e9e
+                if (priv->op_version >= GD_OP_VERSION_RHS_3_0) {
cb8e9e
                         if (strlen(brickinfo->mount_dir) < 1) {
cb8e9e
                                 ret = glusterd_get_brick_mount_dir
cb8e9e
                                         (brickinfo->path, brickinfo->hostname,
3604df
@@ -2253,10 +2253,10 @@ glusterd_op_create_volume (dict_t *dict, char **op_errstr)
cb8e9e
                                  "redundancy count for volume %s", volname);
cb8e9e
                         goto out;
cb8e9e
                 }
cb8e9e
-                if (priv->op_version < GD_OP_VERSION_3_6_0) {
cb8e9e
+                if (priv->op_version < GD_OP_VERSION_3_7_0) {
12a457
                         gf_msg (this->name, GF_LOG_ERROR, 0,
12a457
                                 GD_MSG_UNSUPPORTED_VERSION, "Disperse volume "
cb8e9e
-                                "needs op-version 3.6.0 or higher");
cb8e9e
+                                "needs op-version 30700 or higher");
cb8e9e
                         ret = -1;
cb8e9e
                         goto out;
cb8e9e
                 }
3604df
@@ -2359,7 +2359,7 @@ glusterd_op_create_volume (dict_t *dict, char **op_errstr)
cb8e9e
                 /* A bricks mount dir is required only by snapshots which were
cb8e9e
                  * introduced in gluster-3.6.0
cb8e9e
                  */
cb8e9e
-                if (priv->op_version >= GD_OP_VERSION_3_6_0) {
cb8e9e
+                if (priv->op_version >= GD_OP_VERSION_RHS_3_0) {
cb8e9e
                         brick_mount_dir = NULL;
cb8e9e
                         snprintf (key, sizeof(key), "brick%d.mount_dir", i);
cb8e9e
                         ret = dict_get_str (dict, key, &brick_mount_dir);
3604df
@@ -2545,7 +2545,7 @@ glusterd_op_start_volume (dict_t *dict, char **op_errstr)
cb8e9e
         /* A bricks mount dir is required only by snapshots which were
cb8e9e
          * introduced in gluster-3.6.0
cb8e9e
          */
cb8e9e
-        if (conf->op_version >= GD_OP_VERSION_3_6_0) {
cb8e9e
+        if (conf->op_version >= GD_OP_VERSION_RHS_3_0) {
cb8e9e
                 cds_list_for_each_entry (brickinfo, &volinfo->bricks,
cb8e9e
                                          brick_list) {
cb8e9e
                         brick_count++;
cb8e9e
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
3604df
index 1e24ada..be624b7 100644
cb8e9e
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
cb8e9e
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
3604df
@@ -1061,7 +1061,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         { .key         = "cluster.subvols-per-directory",
cb8e9e
           .voltype     = "cluster/distribute",
cb8e9e
           .option      = "directory-layout-spread",
cb8e9e
-          .op_version  = 2,
cb8e9e
+          .op_version  = 1,
cb8e9e
           .validate_fn = validate_subvols_per_directory,
cb8e9e
           .flags       = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
3604df
@@ -1073,27 +1073,27 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         { .key        = "cluster.rsync-hash-regex",
cb8e9e
           .voltype    = "cluster/distribute",
cb8e9e
           .type       = NO_DOC,
cb8e9e
-          .op_version = 3,
cb8e9e
+          .op_version = 2,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "cluster.extra-hash-regex",
cb8e9e
           .voltype    = "cluster/distribute",
cb8e9e
           .type       = NO_DOC,
cb8e9e
-          .op_version = 3,
cb8e9e
+          .op_version = 2,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "cluster.dht-xattr-name",
cb8e9e
           .voltype    = "cluster/distribute",
cb8e9e
           .option     = "xattr-name",
cb8e9e
           .type       = NO_DOC,
cb8e9e
-          .op_version = 3,
cb8e9e
+          .op_version = 2,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "cluster.randomize-hash-range-by-gfid",
cb8e9e
           .voltype    = "cluster/distribute",
cb8e9e
           .option     = "randomize-hash-range-by-gfid",
cb8e9e
           .type       = NO_DOC,
cb8e9e
-          .op_version = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version = GD_OP_VERSION_3_7_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT,
cb8e9e
         },
cb8e9e
         { .key         = "cluster.rebal-throttle",
3604df
@@ -1125,12 +1125,12 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype    = "cluster/nufa",
cb8e9e
           .option     = "local-volume-name",
cb8e9e
           .type       = NO_DOC,
cb8e9e
-          .op_version = 3,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "cluster.weighted-rebalance",
cb8e9e
           .voltype    = "cluster/distribute",
cb8e9e
-          .op_version = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version = GD_OP_VERSION_3_7_0,
cb8e9e
         },
cb8e9e
 
cb8e9e
         /* Switch xlator options (Distribute special case) */
3604df
@@ -1138,14 +1138,14 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype    = "cluster/distribute",
cb8e9e
           .option     = "!switch",
cb8e9e
           .type       = NO_DOC,
cb8e9e
-          .op_version = 3,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "cluster.switch-pattern",
cb8e9e
           .voltype    = "cluster/switch",
cb8e9e
           .option     = "pattern.switch.case",
cb8e9e
           .type       = NO_DOC,
cb8e9e
-          .op_version = 3,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
 
3604df
@@ -1273,18 +1273,18 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         },
cb8e9e
         { .key        = "cluster.readdir-failover",
cb8e9e
           .voltype    = "cluster/replicate",
cb8e9e
-          .op_version = 2,
cb8e9e
+          .op_version = 1,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "cluster.ensure-durability",
cb8e9e
           .voltype    = "cluster/replicate",
cb8e9e
-          .op_version = 3,
cb8e9e
+          .op_version = 2,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "cluster.consistent-metadata",
cb8e9e
           .voltype    = "cluster/replicate",
cb8e9e
           .type       = DOC,
cb8e9e
-          .op_version = GD_OP_VERSION_3_7_0,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0_4,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
3604df
         { .key        = "cluster.heal-wait-queue-length",
3604df
@@ -1360,45 +1360,45 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         { .key         = "diagnostics.brick-logger",
cb8e9e
           .voltype     = "debug/io-stats",
cb8e9e
           .option      = "!logger",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key        = "diagnostics.client-logger",
cb8e9e
           .voltype    = "debug/io-stats",
cb8e9e
           .option     = "!logger",
cb8e9e
-          .op_version = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key         = "diagnostics.brick-log-format",
cb8e9e
           .voltype     = "debug/io-stats",
cb8e9e
           .option      = "!log-format",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key        = "diagnostics.client-log-format",
cb8e9e
           .voltype    = "debug/io-stats",
cb8e9e
           .option     = "!log-format",
cb8e9e
-          .op_version = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key         = "diagnostics.brick-log-buf-size",
cb8e9e
           .voltype     = "debug/io-stats",
cb8e9e
           .option      = "!log-buf-size",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key        = "diagnostics.client-log-buf-size",
cb8e9e
           .voltype    = "debug/io-stats",
cb8e9e
           .option     = "!log-buf-size",
cb8e9e
-          .op_version = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key         = "diagnostics.brick-log-flush-timeout",
cb8e9e
           .voltype     = "debug/io-stats",
cb8e9e
           .option      = "!log-flush-timeout",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key        = "diagnostics.client-log-flush-timeout",
cb8e9e
           .voltype    = "debug/io-stats",
cb8e9e
           .option     = "!log-flush-timeout",
cb8e9e
-          .op_version = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
3604df
         { .key         = "diagnostics.stats-dump-interval",
3604df
@@ -1483,7 +1483,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         },
cb8e9e
         { .key         = "performance.least-rate-limit",
cb8e9e
           .voltype     = "performance/io-threads",
cb8e9e
-          .op_version  = 2
cb8e9e
+          .op_version  = 1
cb8e9e
         },
cb8e9e
 
cb8e9e
         /* Other perf xlators' options */
3604df
@@ -1502,7 +1502,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         { .key        = "performance.nfs.flush-behind",
cb8e9e
           .voltype    = "performance/write-behind",
cb8e9e
           .option     = "flush-behind",
cb8e9e
-          .op_version = 1,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "performance.write-behind-window-size",
3604df
@@ -1528,43 +1528,43 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         { .key        = "performance.nfs.write-behind-window-size",
cb8e9e
           .voltype    = "performance/write-behind",
cb8e9e
           .option     = "cache-size",
cb8e9e
-          .op_version = 1,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "performance.strict-o-direct",
cb8e9e
           .voltype    = "performance/write-behind",
cb8e9e
           .option     = "strict-O_DIRECT",
cb8e9e
-          .op_version = 2,
cb8e9e
+          .op_version = 1,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "performance.nfs.strict-o-direct",
cb8e9e
           .voltype    = "performance/write-behind",
cb8e9e
           .option     = "strict-O_DIRECT",
cb8e9e
-          .op_version = 2,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "performance.strict-write-ordering",
cb8e9e
           .voltype    = "performance/write-behind",
cb8e9e
           .option     = "strict-write-ordering",
cb8e9e
-          .op_version = 2,
cb8e9e
+          .op_version = 1,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "performance.nfs.strict-write-ordering",
cb8e9e
           .voltype    = "performance/write-behind",
cb8e9e
           .option     = "strict-write-ordering",
cb8e9e
-          .op_version = 2,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "performance.lazy-open",
cb8e9e
           .voltype    = "performance/open-behind",
cb8e9e
           .option     = "lazy-open",
cb8e9e
-          .op_version = 3,
cb8e9e
+          .op_version = 2,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "performance.read-after-open",
cb8e9e
           .voltype    = "performance/open-behind",
cb8e9e
           .option     = "read-after-open",
cb8e9e
-          .op_version = 3,
cb8e9e
+          .op_version = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key        = "performance.read-ahead-page-count",
3604df
@@ -1594,7 +1594,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
 	  .voltype     = "encryption/crypt",
cb8e9e
 	  .option      = "!feat",
cb8e9e
 	  .value       = "off",
cb8e9e
-	  .op_version  = 3,
cb8e9e
+	  .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
 	  .description = "enable/disable client-side encryption for "
cb8e9e
                          "the volume.",
cb8e9e
 	  .flags       = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT
3604df
@@ -1602,17 +1602,17 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
 
cb8e9e
         { .key         = "encryption.master-key",
cb8e9e
           .voltype     = "encryption/crypt",
cb8e9e
-          .op_version  = 3,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key         = "encryption.data-key-size",
cb8e9e
           .voltype     = "encryption/crypt",
cb8e9e
-          .op_version  = 3,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key         = "encryption.block-size",
cb8e9e
           .voltype     = "encryption/crypt",
cb8e9e
-          .op_version  = 3,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
 
3604df
@@ -1655,7 +1655,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         { .key        = "network.remote-dio",
cb8e9e
           .voltype    = "protocol/client",
cb8e9e
           .option     = "filter-O_DIRECT",
cb8e9e
-          .op_version = 2,
cb8e9e
+          .op_version = 1,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT
cb8e9e
         },
cb8e9e
         { .key         = "client.own-thread",
3604df
@@ -1666,7 +1666,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         },
cb8e9e
         { .key         = "client.event-threads",
cb8e9e
           .voltype     = "protocol/client",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_7_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0_4,
cb8e9e
         },
cb8e9e
 
cb8e9e
         /* Server xlator options */
3604df
@@ -1710,17 +1710,17 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         { .key         = "server.root-squash",
cb8e9e
           .voltype     = "protocol/server",
cb8e9e
           .option      = "root-squash",
cb8e9e
-          .op_version  = 2
cb8e9e
+          .op_version  = 1
cb8e9e
         },
cb8e9e
         { .key         = "server.anonuid",
cb8e9e
           .voltype     = "protocol/server",
cb8e9e
           .option      = "anonuid",
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0
cb8e9e
         },
cb8e9e
         { .key         = "server.anongid",
cb8e9e
           .voltype     = "protocol/server",
cb8e9e
           .option      = "anongid",
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0
cb8e9e
         },
cb8e9e
         { .key         = "server.statedump-path",
cb8e9e
           .voltype     = "protocol/server",
3604df
@@ -1731,7 +1731,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype     = "protocol/server",
cb8e9e
           .option      = "rpc.outstanding-rpc-limit",
cb8e9e
           .type        = GLOBAL_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "features.lock-heal",
cb8e9e
           .voltype     = "protocol/server",
3604df
@@ -1757,11 +1757,11 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .option      = "!ssl-allow",
cb8e9e
           .value       = "*",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_3_7_0,
cb8e9e
         },
cb8e9e
         { .key         = "server.manage-gids",
cb8e9e
           .voltype     = "protocol/server",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
12a457
         { .key         = "server.dynamic-auth",
12a457
           .voltype     = "protocol/server",
3604df
@@ -1770,11 +1770,11 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         { .key         = "client.send-gids",
cb8e9e
           .voltype     = "protocol/client",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key         = "server.gid-timeout",
cb8e9e
           .voltype     = "protocol/server",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key         = "server.own-thread",
cb8e9e
           .voltype     = "protocol/server",
3604df
@@ -1784,7 +1784,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         },
cb8e9e
         { .key         = "server.event-threads",
cb8e9e
           .voltype     = "protocol/server",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_7_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0_4,
cb8e9e
         },
cb8e9e
 
cb8e9e
         /* Generic transport options */
3604df
@@ -1811,12 +1811,12 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         { .key         = SSL_CERT_DEPTH_OPT,
cb8e9e
           .voltype     = "rpc-transport/socket",
cb8e9e
           .option      = "!ssl-cert-depth",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_3_7_0,
cb8e9e
         },
cb8e9e
         { .key         = SSL_CIPHER_LIST_OPT,
cb8e9e
           .voltype     = "rpc-transport/socket",
cb8e9e
           .option      = "!ssl-cipher-list",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_3_7_0,
cb8e9e
         },
12a457
         { .key        = SSL_DH_PARAM_OPT,
12a457
           .voltype     = "rpc-transport/socket",
3604df
@@ -1857,7 +1857,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype     = "performance/readdir-ahead",
cb8e9e
           .option      = "!perf",
cb8e9e
           .value       = "off",
cb8e9e
-          .op_version  = 3,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .description = "enable/disable readdir-ahead translator in the volume.",
cb8e9e
           .flags       = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT
cb8e9e
         },
3604df
@@ -1964,7 +1964,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
3604df
 	/* Feature translators */
cb8e9e
         { .key         = "features.uss",
cb8e9e
           .voltype     = "features/snapview-server",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .value       = "off",
cb8e9e
           .flags       = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT,
cb8e9e
           .validate_fn = validate_uss,
3604df
@@ -1974,7 +1974,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
 
cb8e9e
         { .key         = "features.snapshot-directory",
cb8e9e
           .voltype     = "features/snapview-client",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .value       = ".snaps",
cb8e9e
           .flags       = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT,
12a457
           .validate_fn = validate_uss_dir,
3604df
@@ -1985,7 +1985,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
 
cb8e9e
         { .key         = "features.show-snapshot-directory",
cb8e9e
           .voltype     = "features/snapview-client",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .value       = "off",
cb8e9e
           .flags       = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT,
cb8e9e
           .description = "show entry point in readdir output of "
3604df
@@ -2000,35 +2000,35 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype     = "features/cdc",
cb8e9e
           .option      = "!feat",
cb8e9e
           .value       = "off",
cb8e9e
-          .op_version  = 3,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
           .description = "enable/disable network compression translator",
cb8e9e
           .flags       = OPT_FLAG_XLATOR_OPT
cb8e9e
         },
cb8e9e
         { .key         = "network.compression.window-size",
cb8e9e
           .voltype     = "features/cdc",
cb8e9e
           .option      = "window-size",
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0
cb8e9e
         },
cb8e9e
         { .key         = "network.compression.mem-level",
cb8e9e
           .voltype     = "features/cdc",
cb8e9e
           .option      = "mem-level",
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0
cb8e9e
         },
cb8e9e
         { .key         = "network.compression.min-size",
cb8e9e
           .voltype     = "features/cdc",
cb8e9e
           .option      = "min-size",
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0
cb8e9e
         },
cb8e9e
         { .key         = "network.compression.compression-level",
cb8e9e
           .voltype     = "features/cdc",
cb8e9e
           .option      = "compression-level",
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0
cb8e9e
         },
cb8e9e
         { .key         = "network.compression.debug",
cb8e9e
           .voltype     = "features/cdc",
cb8e9e
           .option      = "debug",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0
cb8e9e
         },
cb8e9e
 #endif
cb8e9e
 
3604df
@@ -2051,25 +2051,25 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype       = "features/quota",
cb8e9e
           .option        = "default-soft-limit",
cb8e9e
           .type          = NO_DOC,
cb8e9e
-          .op_version    = 3,
cb8e9e
+          .op_version    = 2,
cb8e9e
         },
cb8e9e
         { .key           = "features.soft-timeout",
cb8e9e
           .voltype       = "features/quota",
cb8e9e
           .option        = "soft-timeout",
cb8e9e
           .type          = NO_DOC,
cb8e9e
-          .op_version    = 3,
cb8e9e
+          .op_version    = 2,
cb8e9e
         },
cb8e9e
         { .key           = "features.hard-timeout",
cb8e9e
           .voltype       = "features/quota",
cb8e9e
           .option        = "hard-timeout",
cb8e9e
           .type          = NO_DOC,
cb8e9e
-          .op_version    = 3,
cb8e9e
+          .op_version    = 2,
cb8e9e
         },
cb8e9e
         { .key           = "features.alert-time",
cb8e9e
           .voltype       = "features/quota",
cb8e9e
           .option        = "alert-time",
cb8e9e
           .type          = NO_DOC,
cb8e9e
-          .op_version    = 3,
cb8e9e
+          .op_version    = 2,
cb8e9e
         },
cb8e9e
         { .key           = "features.quota-deem-statfs",
cb8e9e
           .voltype       = "features/quota",
3604df
@@ -2184,25 +2184,25 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype     = "debug/error-gen",
cb8e9e
           .option      = "failure",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "debug.error-number",
cb8e9e
           .voltype     = "debug/error-gen",
cb8e9e
           .option      = "error-no",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "debug.random-failure",
cb8e9e
           .voltype     = "debug/error-gen",
cb8e9e
           .option      = "random-failure",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "debug.error-fops",
cb8e9e
           .voltype     = "debug/error-gen",
cb8e9e
           .option      = "enable",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
 
cb8e9e
 
3604df
@@ -2253,7 +2253,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype     = "nfs/server",
cb8e9e
           .option      = "rpc.outstanding-rpc-limit",
cb8e9e
           .type        = GLOBAL_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "nfs.port",
cb8e9e
           .voltype     = "nfs/server",
3604df
@@ -2329,7 +2329,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype     = "nfs/server",
cb8e9e
           .option      = "nfs.acl",
cb8e9e
           .type        = GLOBAL_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "nfs.mount-udp",
cb8e9e
           .voltype     = "nfs/server",
3604df
@@ -2347,13 +2347,13 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype     = "nfs/server",
cb8e9e
           .option      = "nfs.rpc-statd",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key         = "nfs.log-level",
cb8e9e
           .voltype     = "nfs/server",
cb8e9e
           .option      = "nfs.log-level",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key         = "nfs.server-aux-gids",
cb8e9e
           .voltype     = "nfs/server",
3604df
@@ -2365,31 +2365,31 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype     = "nfs/server",
cb8e9e
           .option      = "nfs.drc",
cb8e9e
           .type        = GLOBAL_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 1
cb8e9e
         },
cb8e9e
         { .key         = "nfs.drc-size",
cb8e9e
           .voltype     = "nfs/server",
cb8e9e
           .option      = "nfs.drc-size",
cb8e9e
           .type        = GLOBAL_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 1
cb8e9e
         },
cb8e9e
         { .key         = "nfs.read-size",
cb8e9e
           .voltype     = "nfs/server",
cb8e9e
           .option      = "nfs3.read-size",
cb8e9e
           .type        = GLOBAL_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "nfs.write-size",
cb8e9e
           .voltype     = "nfs/server",
cb8e9e
           .option      = "nfs3.write-size",
cb8e9e
           .type        = GLOBAL_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "nfs.readdir-size",
cb8e9e
           .voltype     = "nfs/server",
cb8e9e
           .option      = "nfs3.readdir-size",
cb8e9e
           .type        = GLOBAL_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
3604df
         { .key         = "nfs.rdirplus",
3604df
           .voltype     = "nfs/server",
3604df
@@ -2424,7 +2424,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         { .key        = "features.read-only",
cb8e9e
           .voltype    = "features/read-only",
cb8e9e
           .option     = "read-only",
cb8e9e
-          .op_version = 1,
cb8e9e
+          .op_version = 2,
cb8e9e
           .flags      = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT
cb8e9e
         },
3604df
         { .key         = "features.worm",
3604df
@@ -2467,15 +2467,15 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         },
cb8e9e
         { .key         = "storage.batch-fsync-mode",
cb8e9e
           .voltype     = "storage/posix",
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "storage.batch-fsync-delay-usec",
cb8e9e
           .voltype     = "storage/posix",
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "storage.xattr-user-namespace-mode",
cb8e9e
           .voltype     = "storage/posix",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key         = "storage.owner-uid",
cb8e9e
           .voltype     = "storage/posix",
3604df
@@ -2489,20 +2489,20 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         },
cb8e9e
         { .key         = "storage.node-uuid-pathinfo",
cb8e9e
           .voltype     = "storage/posix",
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "storage.health-check-interval",
cb8e9e
           .voltype     = "storage/posix",
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .option      = "update-link-count-parent",
cb8e9e
           .key         = "storage.build-pgfid",
cb8e9e
           .voltype     = "storage/posix",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key         = "storage.bd-aio",
cb8e9e
           .voltype     = "storage/bd",
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0
cb8e9e
         },
cb8e9e
         { .key        = "config.memory-accounting",
12a457
           .voltype    = "mgmt/glusterd",
3604df
@@ -2518,43 +2518,43 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
         { .key         = GLUSTERD_QUORUM_TYPE_KEY,
cb8e9e
           .voltype     = "mgmt/glusterd",
cb8e9e
           .value       = "off",
cb8e9e
-          .op_version  = 2
cb8e9e
+          .op_version  = 1
cb8e9e
         },
cb8e9e
         { .key         = GLUSTERD_QUORUM_RATIO_KEY,
cb8e9e
           .voltype     = "mgmt/glusterd",
cb8e9e
           .value       = "0",
cb8e9e
-          .op_version  = 2
cb8e9e
+          .op_version  = 1
cb8e9e
         },
cb8e9e
         /* changelog translator - global tunables */
cb8e9e
         { .key         = "changelog.changelog",
cb8e9e
           .voltype     = "features/changelog",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "changelog.changelog-dir",
cb8e9e
           .voltype     = "features/changelog",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "changelog.encoding",
cb8e9e
           .voltype     = "features/changelog",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "changelog.rollover-time",
cb8e9e
           .voltype     = "features/changelog",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "changelog.fsync-interval",
cb8e9e
           .voltype     = "features/changelog",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = 3
cb8e9e
+          .op_version  = 2
cb8e9e
         },
cb8e9e
         { .key         = "changelog.changelog-barrier-timeout",
cb8e9e
           .voltype     = "features/changelog",
cb8e9e
           .value       = BARRIER_TIMEOUT,
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key         = "changelog.capture-del-path",
cb8e9e
           .voltype     = "features/changelog",
3604df
@@ -2565,16 +2565,16 @@ struct volopt_map_entry glusterd_volopt_map[] = {
cb8e9e
           .voltype     = "features/barrier",
cb8e9e
           .value       = "disable",
cb8e9e
           .type        = NO_DOC,
cb8e9e
-          .op_version  = GD_OP_VERSION_3_7_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key         = "features.barrier-timeout",
cb8e9e
           .voltype     = "features/barrier",
cb8e9e
           .value       = BARRIER_TIMEOUT,
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         { .key         = "cluster.op-version",
cb8e9e
           .voltype     = "mgmt/glusterd",
cb8e9e
-          .op_version  = GD_OP_VERSION_3_6_0,
cb8e9e
+          .op_version  = GD_OP_VERSION_RHS_3_0,
cb8e9e
         },
cb8e9e
         /*Trash translator options */
cb8e9e
         { .key         = "features.trash",
cb8e9e
-- 
cb8e9e
1.7.1
cb8e9e