summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2014-06-08 18:39:55 +0200
committerNiels de Vos <ndevos@redhat.com>2014-06-10 00:47:12 -0700
commit6648b92e980c9d59c719a461b37951109839182e (patch)
treecc7064f80433a7be8c9da65b603b67ab0e9a64b2
parent325c77ff9d197634656d2ed4af02fbe4de52fbcb (diff)
glusterd: Better op-version values and ranges
Till now, the op-version was an incrementing integer that was incremented by 1 for every Y release (when using the X.Y.Z release numbering). This is not flexible enough to handle backports of features into Z releases. Going forward, from the upcoming 3.6.0 and 3.5.1 releases, the op-versions will be multi-digit integer values composed of the version numbers, instead of a simple incrementing integer. An X.Y.Z release will have XYZ as its op-version. Y and Z will always be 2 digits wide and will be padded with 0 if required. This way of bumping op-versions allows for gaps in between the subsequent Y releases. These gaps will allow backporting features from new Y releases into old Z releases. Change-Id: Ib6a09989f03521146e299ec0588fe36273191e47 Depends-on: http://review.gluster.org/7963 BUG: 1096425 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/8010 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
-rw-r--r--libglusterfs/src/globals.h18
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c6
2 files changed, 15 insertions, 9 deletions
diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h
index 3085db21c1a..3d2cdc306c1 100644
--- a/libglusterfs/src/globals.h
+++ b/libglusterfs/src/globals.h
@@ -21,16 +21,22 @@
*
* 3.3.0 - 1
* 3.4.0 - 2
- * 3.next (3.5?) - 3
+ * 3.5.0 - 3
+ * 3.5.1 - 30501
+ * 3.next (3.6?) - 30600
*
- * TODO: Change above comment once gluster version is finalised
- * TODO: Finalize the op-version ranges
+ * Starting with Gluster v3.6 and v3.5.1, 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.
*/
#define GD_OP_VERSION_MIN 1 /* MIN is the fresh start op-version, mostly
should not change */
-#define GD_OP_VERSION_MAX 3 /* MAX VERSION is the maximum count in VME table,
- should keep changing with introduction of newer
- versions */
+#define GD_OP_VERSION_MAX 30501 /* MAX VERSION is the maximum count in VME
+ table, should keep changing with
+ introduction of newer versions */
#include "xlator.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index d29e5d5a20a..b8bad7622dc 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -862,16 +862,16 @@ struct volopt_map_entry glusterd_volopt_map[] = {
},
{ .key = "server.manage-gids",
.voltype = "protocol/server",
- .op_version = 4,
+ .op_version = 30501,
},
{ .key = "client.send-gids",
.voltype = "protocol/client",
.type = NO_DOC,
- .op_version = 4,
+ .op_version = 30501,
},
{ .key = "server.gid-timeout",
.voltype = "protocol/server",
- .op_version = 4,
+ .op_version = 30501,
},
/* Performance xlators enable/disbable options */