summaryrefslogtreecommitdiffstats
path: root/libglusterfs
diff options
context:
space:
mode:
authorKaushal M <kaushal@redhat.com>2014-06-03 16:14:35 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2014-06-09 20:42:54 -0700
commit66b99406a769a14b50aac2d077b5698b8be30aa6 (patch)
treecdb283de0958be1b763d21a760fe79b86d8286af /libglusterfs
parent211785f29904995324bfd3c7fa4b35a498bf632a (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 release, 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: I463f82902d997ec07e76dae58ac935f33e6393c2 BUG: 1104997 Signed-off-by: Kaushal M <kaushal@redhat.com> Reviewed-on: http://review.gluster.org/7963 Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'libglusterfs')
-rw-r--r--libglusterfs/src/globals.h27
1 files changed, 18 insertions, 9 deletions
diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h
index 2e520c10e02..44568406abf 100644
--- a/libglusterfs/src/globals.h
+++ b/libglusterfs/src/globals.h
@@ -19,21 +19,30 @@
/* Gluster versions - OP-VERSION mapping
*
- * 3.3.0 - 1
- * 3.4.0 - 2
+ * 3.3.x - 1
+ * 3.4.x - 2
* 3.5.0 - 3
- * 3.next (3.6?) - 4
+ * 3.5.1 - 30501
+ * 3.6.0 - 30600
*
* TODO: Change above comment once gluster version is finalised
- * TODO: Finalize the op-version ranges
+ *
+ * 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.
*/
#define GD_OP_VERSION_MIN 1 /* MIN is the fresh start op-version, mostly
should not change */
-#define GD_OP_VERSION_MAX 4 /* MAX VERSION is the maximum count in VME table,
- should keep changing with introduction of newer
- versions */
-#define GD_OP_VERSION_4 4 /* Op-Version 4 */
-#define GD_OP_VER_PERSISTENT_AFR_XATTRS GD_OP_VERSION_4
+#define GD_OP_VERSION_MAX 30600 /* MAX VERSION is the maximum count in VME
+ table, should keep changing with
+ introduction of newer versions */
+
+#define GD_OP_VERSION_3_6_0 30600 /* Op-Version for GlusterFS 3.6.0 */
+
+#define GD_OP_VER_PERSISTENT_AFR_XATTRS GD_OP_VERSION_3_6_0
#include "xlator.h"