diff options
| -rw-r--r-- | tests/basic/quick-read-with-upcall.t | 1 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 4 | ||||
| -rw-r--r-- | xlators/performance/quick-read/src/quick-read.c | 9 |
3 files changed, 8 insertions, 6 deletions
diff --git a/tests/basic/quick-read-with-upcall.t b/tests/basic/quick-read-with-upcall.t index 0eab8e1a9f6..2012053d125 100644 --- a/tests/basic/quick-read-with-upcall.t +++ b/tests/basic/quick-read-with-upcall.t @@ -63,6 +63,7 @@ EXPECT "$D0" cat $M1/test1.txt sleep 30 EXPECT "$D1" cat $M1/test1.txt +TEST $CLI volume set $V0 performance.quick-read-cache-invalidation on TEST $CLI volume set $V0 performance.cache-invalidation on TEST write_to "$M0/test2.txt" "$D0" diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index b943f66c008..4cadcd5dd19 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -1251,9 +1251,9 @@ struct volopt_map_entry glusterd_volopt_map[] = { .option = "cache-timeout", .op_version = 1, .flags = VOLOPT_FLAG_CLIENT_OPT}, - {.key = "performance.cache-invalidation", + {.key = "performance.quick-read-cache-invalidation", .voltype = "performance/quick-read", - .option = "cache-invalidation", + .option = "quick-read-cache-invalidation", .op_version = GD_OP_VERSION_4_0_0, .flags = VOLOPT_FLAG_CLIENT_OPT}, {.key = "performance.ctime-invalidation", diff --git a/xlators/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c index 244e8c8d44e..4f16d148262 100644 --- a/xlators/performance/quick-read/src/quick-read.c +++ b/xlators/performance/quick-read/src/quick-read.c @@ -1218,8 +1218,8 @@ qr_reconfigure(xlator_t *this, dict_t *options) GF_OPTION_RECONF("cache-timeout", conf->cache_timeout, options, int32, out); - GF_OPTION_RECONF("cache-invalidation", conf->qr_invalidation, options, bool, - out); + GF_OPTION_RECONF("quick-read-cache-invalidation", conf->qr_invalidation, + options, bool, out); GF_OPTION_RECONF("ctime-invalidation", conf->ctime_invalidation, options, bool, out); @@ -1369,7 +1369,8 @@ qr_init(xlator_t *this) GF_OPTION_INIT("cache-timeout", conf->cache_timeout, int32, out); - GF_OPTION_INIT("cache-invalidation", conf->qr_invalidation, bool, out); + GF_OPTION_INIT("quick-read-cache-invalidation", conf->qr_invalidation, bool, + out); GF_OPTION_INIT("cache-size", conf->cache_size, size_uint64, out); if (!check_cache_size_ok(this, conf->cache_size)) { @@ -1615,7 +1616,7 @@ struct volume_options qr_options[] = { .flags = OPT_FLAG_CLIENT_OPT | OPT_FLAG_SETTABLE | OPT_FLAG_DOC, }, { - .key = {"cache-invalidation"}, + .key = {"quick-read-cache-invalidation"}, .type = GF_OPTION_TYPE_BOOL, .default_value = "false", .op_version = {GD_OP_VERSION_4_0_0}, |