andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glusterd: Update op-version from 4.2 to 5.0

Browse Source 
Post changing the max op-version to 4.2, after release
4.1 branching, the decision was to go with increasing
release numbers. Thus this needs to change to 5.0.

This commit addresses the above change.

Fixes: bz#1628664
Change-Id: Ifcc0c6da90fdd51e4eceea40749511110a432cce
Signed-off-by: ShyamsundarR <srangana@redhat.com>
This commit is contained in:
ShyamsundarR 2018-09-13 12:50:30 -04:00
parent f15e948da3
commit 0b3f08cd50
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libglusterfs/src/globals.h
View File

@ -45,11 +45,11 @@
1 /* MIN is the fresh start op-version, mostly \
should not change */
#define GD_OP_VERSION_MAX \
GD_OP_VERSION_4_2_0 /* MAX VERSION is the maximum \
count in VME table, should \
keep changing with \
introduction of newer \
versions */
GD_OP_VERSION_6_0 /* 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 */
@ -109,7 +109,9 @@
#define GD_OP_VERSION_4_1_0 40100 /* Op-version for GlusterFS 4.1.0 */
#define GD_OP_VERSION_4_2_0 40200 /* Op-version for GlusterFS 4.2.0 */
#define GD_OP_VERSION_5_0 50000 /* Op-version for GlusterFS 5.0 */
#define GD_OP_VERSION_6_0 60000 /* Op-version for GlusterFS 6.0 */
#define GD_OP_VER_PERSISTENT_AFR_XATTRS GD_OP_VERSION_3_6_0

4
xlators/features/shard/src/shard.c
View File

@ -6806,7 +6806,7 @@ struct volume_options options[] = {
{
.key = {"shard-deletion-rate"},
.type = GF_OPTION_TYPE_INT,
.op_version = {GD_OP_VERSION_4_2_0},
.op_version = {GD_OP_VERSION_5_0},
.flags = OPT_FLAG_SETTABLE | OPT_FLAG_CLIENT_OPT | OPT_FLAG_DOC,
.tags = {"shard"},
.default_value = "100",
@ -6817,7 +6817,7 @@ struct volume_options options[] = {
{
.key = {"shard-lru-limit"},
.type = GF_OPTION_TYPE_INT,
.op_version = {GD_OP_VERSION_4_2_0},
.op_version = {GD_OP_VERSION_5_0},
.flags = OPT_FLAG_SETTABLE | OPT_FLAG_CLIENT_OPT,
.tags = {"shard"},
.default_value = "16384",

18
xlators/mgmt/glusterd/src/glusterd-volume-set.c
View File

@ -1738,7 +1738,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
{.key = "performance.ctime-invalidation",
.voltype = "performance/quick-read",
.option = "ctime-invalidation",
.op_version = GD_OP_VERSION_4_2_0,
.op_version = GD_OP_VERSION_5_0,
.flags = VOLOPT_FLAG_CLIENT_OPT},
{.key = "performance.flush-behind",
.voltype = "performance/write-behind",
@ -3294,13 +3294,13 @@ struct volopt_map_entry glusterd_volopt_map[] = {
{
.key = "features.shard-lru-limit",
.voltype = "features/shard",
.op_version = GD_OP_VERSION_4_2_0,
.op_version = GD_OP_VERSION_5_0,
.flags = VOLOPT_FLAG_CLIENT_OPT,
.type = NO_DOC,
},
{.key = "features.shard-deletion-rate",
.voltype = "features/shard",
.op_version = GD_OP_VERSION_4_2_0,
.op_version = GD_OP_VERSION_5_0,
.flags = VOLOPT_FLAG_CLIENT_OPT},
{
.key = "features.scrub-throttle",
@ -3617,7 +3617,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "mgmt/glusterd",
.type = GLOBAL_NO_DOC,
.value = "INFO",
.op_version = GD_OP_VERSION_4_2_0},
.op_version = GD_OP_VERSION_5_0},
{.key = "debug.delay-gen",
.voltype = "debug/delay-gen",
.option = "!debug",
@ -3672,22 +3672,22 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.flags = VOLOPT_FLAG_CLIENT_OPT | VOLOPT_FLAG_XLATOR_OPT},
{.key = "feature.cloudsync-storetype",
.voltype = "features/cloudsync",
.op_version = GD_OP_VERSION_4_2_0,
.op_version = GD_OP_VERSION_5_0,
.flags = VOLOPT_FLAG_CLIENT_OPT},
{.key = "features.s3plugin-seckey",
.voltype = "features/cloudsync",
.op_version = GD_OP_VERSION_4_2_0,
.op_version = GD_OP_VERSION_5_0,
.flags = VOLOPT_FLAG_CLIENT_OPT},
{.key = "features.s3plugin-keyid",
.voltype = "features/cloudsync",
.op_version = GD_OP_VERSION_4_2_0,
.op_version = GD_OP_VERSION_5_0,
.flags = VOLOPT_FLAG_CLIENT_OPT},
{.key = "features.s3plugin-bucketid",
.voltype = "features/cloudsync",
.op_version = GD_OP_VERSION_4_2_0,
.op_version = GD_OP_VERSION_5_0,
.flags = VOLOPT_FLAG_CLIENT_OPT},
{.key = "features.s3plugin-hostname",
.voltype = "features/cloudsync",
.op_version = GD_OP_VERSION_4_2_0,
.op_version = GD_OP_VERSION_5_0,
.flags = VOLOPT_FLAG_CLIENT_OPT},
{.key = NULL}};

2
xlators/performance/quick-read/src/quick-read.c
View File

@ -1613,7 +1613,7 @@ struct volume_options qr_options[] = {
.key = {"ctime-invalidation"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "false",
.op_version = {GD_OP_VERSION_4_2_0},
.op_version = {GD_OP_VERSION_5_0},
.flags = OPT_FLAG_CLIENT_OPT | OPT_FLAG_SETTABLE | OPT_FLAG_DOC,
.description = "Quick-read by default uses mtime to identify changes "
"to file data. However there are applications like "

4
xlators/playground/template/src/template.c
View File

@ -162,7 +162,7 @@ struct volume_options template_options[] = {
.max = 1024,
.default_value = "1",
.description = "a dummy option to show how to set the option",
.op_version = {GD_OP_VERSION_4_2_0},
.op_version = {GD_OP_VERSION_5_0},
.flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC,
.level = OPT_STATUS_EXPERIMENTAL,
.tags = {"development", "experimental", "template"},
@ -177,7 +177,7 @@ xlator_api_t xlator_api = {
.reconfigure = template_reconfigure,
.mem_acct_init = template_mem_acct_init,
.dump_metrics = template_dump_metrics,
.op_version = {GD_OP_VERSION_4_2_0},
.op_version = {GD_OP_VERSION_5_0},
.dumpops = &template_dumpops,
.fops = &template_fops,
.cbks = &template_cbks,