diff options
| -rw-r--r-- | xlators/features/marker/src/marker.c | 31 | ||||
| -rw-r--r-- | xlators/features/quota/src/quota.c | 49 |
2 files changed, 51 insertions, 29 deletions
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index 36cfb34f069..659ca890066 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -3526,12 +3526,31 @@ struct xlator_cbks cbks = { }; struct volume_options options[] = { - {.key = {"volume-uuid"}}, + {.key = {"volume-uuid"}, + .default_value = "{{ volume.id }}"}, {.key = {"timestamp-file"}}, - {.key = {"quota"}}, - {.key = {"inode-quota"} }, - {.key = {"xtime"}}, - {.key = {"gsync-force-xtime"}}, - {.key = {"quota-version"} }, + {.key = {"quota"}, + .op_version = {1}, + .flags = OPT_FLAG_NONE, + .tags = {}, + }, + {.key = {"inode-quota"}, + .op_version = {1}, + .flags = OPT_FLAG_NONE, + .tags = {}, + }, + {.key = {"xtime"}, + .op_version = {1}, + .flags = OPT_FLAG_SETTABLE | OPT_FLAG_FORCE, + .tags = {}, + }, + {.key = {"gsync-force-xtime"}, + .op_version = {2}, + .flags = OPT_FLAG_SETTABLE | OPT_FLAG_FORCE, + .tags = {}, + }, + {.key = {"quota-version"}, + .flags = OPT_FLAG_NONE, + }, {.key = {NULL}} }; diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c index c731748402c..068d2e8c1f1 100644 --- a/xlators/features/quota/src/quota.c +++ b/xlators/features/quota/src/quota.c @@ -5284,23 +5284,32 @@ struct xlator_dumpops dumpops = { .priv = quota_priv_dump, }; struct volume_options options[] = { - {.key = {"limit-set"}}, {.key = {"deem-statfs"}, .type = GF_OPTION_TYPE_BOOL, .default_value = "on", .description = "If set to on, it takes quota limits into" " consideration while estimating fs size. (df command)" - " (Default is on)." + " (Default is on).", + .op_version = {2}, + .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC, + .tags = {}, }, {.key = {"server-quota"}, .type = GF_OPTION_TYPE_BOOL, .default_value = "off", .description = "Skip the quota enforcement if the feature is" - " not turned on. This is not a user exposed option." + " not turned on. This is not a user exposed option.", + .flags = OPT_FLAG_NONE, }, {.key = {"default-soft-limit"}, .type = GF_OPTION_TYPE_PERCENT, .default_value = "80%", + .op_version = {3}, + .description = "Soft limit is expressed as a proportion of hard limit." + " Default-soft-limit is the proportion used when the " + " user does not supply any soft limit value.", + .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC, + .tags = {}, }, {.key = {"soft-timeout"}, .type = GF_OPTION_TYPE_TIME, @@ -5309,7 +5318,10 @@ struct volume_options options[] = { .default_value = "60", .description = "quota caches the directory sizes on client. " "soft-timeout indicates the timeout for the validity of" - " cache before soft-limit has been crossed." + " cache before soft-limit has been crossed.", + .op_version = {3}, + .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC, + .tags = {}, }, {.key = {"hard-timeout"}, .type = GF_OPTION_TYPE_TIME, @@ -5318,27 +5330,14 @@ struct volume_options options[] = { .default_value = "5", .description = "quota caches the directory sizes on client. " "hard-timeout indicates the timeout for the validity of" - " cache after soft-limit has been crossed." + " cache after soft-limit has been crossed.", + .op_version = {3}, + .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC, + .tags = {}, }, - { .key = {"username"}, - .type = GF_OPTION_TYPE_ANY, - }, - { .key = {"password"}, - .type = GF_OPTION_TYPE_ANY, - }, - { .key = {"transport-type"}, - .value = {"tcp", "socket", "ib-verbs", "unix", "ib-sdp", - "tcp/client", "ib-verbs/client", "rdma"}, - .type = GF_OPTION_TYPE_STR, - }, - { .key = {"remote-host"}, - .type = GF_OPTION_TYPE_INTERNET_ADDRESS, - }, - { .key = {"remote-port"}, - .type = GF_OPTION_TYPE_INT, - }, - { .key = {"volume-uuid"}, + { .key = {"volume-uuid"}, .type = GF_OPTION_TYPE_STR, + .default_value = "{{ volume.id }}", .description = "uuid of the volume this brick is part of." }, { .key = {"alert-time"}, @@ -5346,6 +5345,10 @@ struct volume_options options[] = { .min = 0, .max = 7*86400, .default_value = "86400", + .op_version = {3}, + .flags = OPT_FLAG_SETTABLE | OPT_FLAG_DOC, + .description = "Frequency of limit breach messages in log.", + .tags = {}, }, {.key = {NULL}} }; |