summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/bugs/md-cache/bug-1211863.t7
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c2
-rw-r--r--xlators/performance/md-cache/src/md-cache.c4
3 files changed, 7 insertions, 6 deletions
diff --git a/tests/bugs/md-cache/bug-1211863.t b/tests/bugs/md-cache/bug-1211863.t
index 4fa9e33d7a1..ece42fe8d81 100644
--- a/tests/bugs/md-cache/bug-1211863.t
+++ b/tests/bugs/md-cache/bug-1211863.t
@@ -42,16 +42,17 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M1
TEST $CLI volume set $V0 features.cache-invalidation on
TEST $CLI volume set $V0 features.cache-invalidation-timeout 600
+TEST $CLI volume set $V0 performance.cache-invalidation on
-## 18. Restart the volume to restart the bick process
+## 19. Restart the volume to restart the bick process
TEST $CLI volume stop $V0
TEST $CLI volume start $V0
-## 20. Create two gluster mounts
+## 21. Create two gluster mounts
TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M1
-## 22. Repeat the tests 11-14, but this time since cache invalidation is on,
+## 23. Repeat the tests 11-14, but this time since cache invalidation is on,
#the getxattr will reflect the new value
TEST "setfattr -n user.DOSATTRIB -v "abc" $M0/file1"
TEST "getfattr -n user.DOSATTRIB $M1/file1 | grep -q abc"
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 0f8af548fac..b4e1e873460 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -1967,7 +1967,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.op_version = 2,
.flags = OPT_FLAG_CLIENT_OPT
},
- { .key = "features.cache-invalidation",
+ { .key = "performance.cache-invalidation",
.voltype = "performance/md-cache",
.option = "cache-invalidation",
.op_version = GD_OP_VERSION_3_9_0,
diff --git a/xlators/performance/md-cache/src/md-cache.c b/xlators/performance/md-cache/src/md-cache.c
index 8742cfa0cb7..b4448389cad 100644
--- a/xlators/performance/md-cache/src/md-cache.c
+++ b/xlators/performance/md-cache/src/md-cache.c
@@ -2795,8 +2795,8 @@ struct volume_options options[] = {
{ .key = {"cache-invalidation"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "false",
- .description = "When \"on\", invalidates/updates the metadata cache "
- "on receiving of the cache-invalidation notifications",
+ .description = "When \"on\", invalidates/updates the metadata cache,"
+ " on receiving the cache-invalidation notifications",
},
{ .key = {NULL} },
};