diff options
author | Jeff Darcy <jdarcy@fb.com> | 2017-10-02 12:23:14 -0700 |
---|---|---|
committer | Jeff Darcy <jdarcy@fb.com> | 2017-10-02 12:23:14 -0700 |
commit | 8de2ec1b8ddecc9ba01bd918b6b5c208561b22fe (patch) | |
tree | 38fb2920d6143673cae4c898add83ddfdeef9584 | |
parent | d9f9be442808ed13135f560698a2f95fe66282a5 (diff) |
glusterd: fix missing/renamed options
Change-Id: I2ca0298ee9d166f58b8730256ea76a04e547ce5d
Signed-off-by: Jeff Darcy <jdarcy@fb.com>
-rwxr-xr-x | tests/basic/quota.t | 1 | ||||
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 49 |
2 files changed, 47 insertions, 3 deletions
diff --git a/tests/basic/quota.t b/tests/basic/quota.t index 99af5a4e7e4..4706d6bfd31 100755 --- a/tests/basic/quota.t +++ b/tests/basic/quota.t @@ -204,6 +204,7 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 ## --------------------------- ## Test quota volume options ## --------------------------- +read -p "Continue? " nothing TEST $CLI volume reset $V0 EXPECT 'on' volinfo_field $V0 'features.quota' EXPECT 'on' volinfo_field $V0 'features.inode-quota' diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index cd42cf75756..2d5fb944a0d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -1485,6 +1485,32 @@ struct volopt_map_entry glusterd_volopt_map[] = { .value = "off", .op_version = 2 }, + { .key = "diagnostics.fop-sample-all-errors", + .voltype = "debug/io-stats", + .option = "fop-sample-all-errors", + .value = "off", + .type = NO_DOC, + .op_version = 2 + }, + { .key = "diagnostics.fop-sample-hard-errors", + .voltype = "debug/io-stats", + .option = "fop-sample-hard-errors", + .value = "on", + .type = NO_DOC, + .op_version = 2 + }, + { .key = "diagnostics.measure-namespace-rates", + .voltype = "debug/io-stats", + .option = "measure-namespace-rates", + .value = "off", + .type = NO_DOC, + .op_version = 1 + }, + { .key = "diagnostics.ns-rate-window", + .voltype = "debug/io-stats", + .option = "ns-rate-window", + .op_version = 1 + }, /* IO-cache xlator options */ { .key = "performance.cache-max-file-size", @@ -1588,7 +1614,11 @@ struct volopt_map_entry glusterd_volopt_map[] = { .option = "cleanup-disconnected-reqs", .op_version = 2 }, - + { .key = "performance.iot-ns-weighted-queueing", + .voltype = "performance/io-threads", + .option = "ns-weighted-queueing", + .op_version = 2 + }, /* Other perf xlators' options */ { .key = "performance.cache-size", @@ -2118,6 +2148,19 @@ struct volopt_map_entry glusterd_volopt_map[] = { "that tags every fop with a namespace hash for later " "throttling, stats collection, logging, etc." }, + { .key = "features.ns-wind-lookups", + .voltype = "features/namespace", + .op_version = GD_OP_VERSION_3_6_0, + .option = "wind-lookups", + .value = "on", + .flags = OPT_FLAG_CLIENT_OPT, + .description = "If enabled, a GET_ANCESTRY_PATH_KEY getxattr wind " + "will be scheduled for a LOOKUP. Since we have many " + "LOOKUP requests which are sent for files that don't " + "exist, it's often benificial to disable this option, " + "so we don't have a high percentage of bad GETXATTRs " + "in io-stats." + }, #ifdef HAVE_LIB_Z /* Compressor-decompressor xlator options @@ -3153,8 +3196,8 @@ struct volopt_map_entry glusterd_volopt_map[] = { .op_version = GD_OP_VERSION_3_8_0, .flags = OPT_FLAG_CLIENT_OPT }, - { .option = "revocation-secs", - .key = "features.locks-revocation-secs", + { .key = "features.locks-revocation-secs", + .option = "revocation-secs", .voltype = "features/locks", .op_version = 2, }, |