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>

1 files changed, 20 insertions, 20 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 26e86209007..75ec0026ff9 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -613,45 +613,45 @@ struct volopt_map_entry glusterd_volopt_map[] = {
         { .key         = "diagnostics.brick-logger",
           .voltype     = "debug/io-stats",
           .option      = "!logger",
-          .op_version  = 4
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key        = "diagnostics.client-logger",
           .voltype    = "debug/io-stats",
           .option     = "!logger",
-          .op_version = 4,
+          .op_version = GD_OP_VERSION_3_6_0,
           .flags      = OPT_FLAG_CLIENT_OPT
         },
         { .key         = "diagnostics.brick-log-format",
           .voltype     = "debug/io-stats",
           .option      = "!log-format",
-          .op_version  = 4
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key        = "diagnostics.client-log-format",
           .voltype    = "debug/io-stats",
           .option     = "!log-format",
-          .op_version = 4,
+          .op_version = GD_OP_VERSION_3_6_0,
           .flags      = OPT_FLAG_CLIENT_OPT
         },
         { .key         = "diagnostics.brick-log-buf-size",
           .voltype     = "debug/io-stats",
           .option      = "!log-buf-size",
-          .op_version  = 4
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key        = "diagnostics.client-log-buf-size",
           .voltype    = "debug/io-stats",
           .option     = "!log-buf-size",
-          .op_version = 4,
+          .op_version = GD_OP_VERSION_3_6_0,
           .flags      = OPT_FLAG_CLIENT_OPT
         },
         { .key         = "diagnostics.brick-log-flush-timeout",
           .voltype     = "debug/io-stats",
           .option      = "!log-flush-timeout",
-          .op_version  = 4
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key        = "diagnostics.client-log-flush-timeout",
           .voltype    = "debug/io-stats",
           .option     = "!log-flush-timeout",
-          .op_version = 4,
+          .op_version = GD_OP_VERSION_3_6_0,
           .flags      = OPT_FLAG_CLIENT_OPT
         },
 
@@ -946,16 +946,16 @@ struct volopt_map_entry glusterd_volopt_map[] = {
         },
         { .key         = "server.manage-gids",
           .voltype     = "protocol/server",
-          .op_version  = 4,
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key         = "client.send-gids",
           .voltype     = "protocol/client",
           .type        = NO_DOC,
-          .op_version  = 4,
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key         = "server.gid-timeout",
           .voltype     = "protocol/server",
-          .op_version  = 4,
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
 
         /* Performance xlators enable/disbable options */
@@ -1417,12 +1417,12 @@ struct volopt_map_entry glusterd_volopt_map[] = {
         { .key         = "nfs-ganesha.enable",
           .voltype     = "nfs/server",
           .option      = "!nfs-ganesha.enable",
-          .op_version  = 4
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key         = "nfs-ganesha.host",
           .voltype     = "nfs/server",
           .option      = "!nfs-ganesha.host",
-          .op_version  = 4
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key         = "nfs.nlm",
           .voltype     = "nfs/server",
@@ -1452,13 +1452,13 @@ struct volopt_map_entry glusterd_volopt_map[] = {
           .voltype     = "nfs/server",
           .option      = "nfs.rpc-statd",
           .type        = NO_DOC,
-          .op_version  = 4,
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key         = "nfs.log-level",
           .voltype     = "nfs/server",
           .option      = "nfs.log-level",
           .type        = NO_DOC,
-          .op_version  = 4,
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key         = "nfs.server-aux-gids",
           .voltype     = "nfs/server",
@@ -1526,7 +1526,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
         },
         { .key         = "storage.xattr-user-namespace-mode",
           .voltype     = "storage/posix",
-          .op_version  = 4
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key         = "storage.owner-uid",
           .voltype     = "storage/posix",
@@ -1549,7 +1549,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
         { .option      = "update-link-count-parent",
           .key         = "storage.build-pgfid",
           .voltype     = "storage/posix",
-          .op_version  = 4
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key         = "storage.bd-aio",
           .voltype     = "storage/bd",
@@ -1605,16 +1605,16 @@ struct volopt_map_entry glusterd_volopt_map[] = {
         { .key         = "features.barrier",
           .voltype     = "features/barrier",
           .value       = "disable",
-          .op_version  = 4
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key         = "features.barrier-timeout",
           .voltype     = "features/barrier",
           .value       = "120",
-          .op_version  = 4
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key         = "cluster.op-version",
           .voltype     = "mgmt/glusterd",
-          .op_version  = 4
+          .op_version  = GD_OP_VERSION_3_6_0,
         },
         { .key         = NULL
         }