From 6f877d04d6b1b9e0e10904c1a9da9e671bccb290 Mon Sep 17 00:00:00 2001
From: Atin Mukherjee <amukherj@redhat.com>
Date: Mon, 8 Jan 2018 11:22:58 +0530
Subject: features/bit-rot: fix volume options for GD2

Updates #302

Change-Id: I8809f269b93253bce049fdbf28a7f44e85a2b9e7
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
---
 xlators/features/bit-rot/src/bitd/bit-rot.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'xlators')

diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.c b/xlators/features/bit-rot/src/bitd/bit-rot.c
index 04ccc013cda..c1e61966643 100644
--- a/xlators/features/bit-rot/src/bitd/bit-rot.c
+++ b/xlators/features/bit-rot/src/bitd/bit-rot.c
@@ -2148,6 +2148,8 @@ struct volume_options options[] = {
         { .key = {"expiry-time"},
           .type = GF_OPTION_TYPE_INT,
           .default_value = SIGNING_TIMEOUT,
+          .op_version = {GD_OP_VERSION_3_7_0},
+          .flags = OPT_FLAG_SETTABLE,
           .description = "Waiting time for an object on which it waits "
                          "before it is signed",
         },
@@ -2156,13 +2158,17 @@ struct volume_options options[] = {
           .description = "Total number of bricks for the current node for "
                          "all volumes in the trusted storage pool.",
         },
-        { .key = {"scrubber"},
+        { .key = {"scrubber", "scrub"},
           .type = GF_OPTION_TYPE_BOOL,
           .default_value = "false",
+          .op_version = {GD_OP_VERSION_3_7_0},
+          .flags = OPT_FLAG_SETTABLE | OPT_FLAG_FORCE,
           .description = "option to run as a scrubber",
         },
         { .key = {"scrub-throttle"},
           .type = GF_OPTION_TYPE_STR,
+          .op_version = {GD_OP_VERSION_3_7_0},
+          .flags = OPT_FLAG_SETTABLE,
           .description = "Scrub-throttle value is a measure of how fast "
                          "or slow the scrubber scrubs the filesystem for "
                          "volume <VOLNAME>",
@@ -2170,11 +2176,15 @@ struct volume_options options[] = {
         { .key = {"scrub-freq"},
           .type = GF_OPTION_TYPE_STR,
           .default_value = "biweekly",
+          .op_version = {GD_OP_VERSION_3_7_0},
+          .flags = OPT_FLAG_SETTABLE,
           .description = "Scrub frequency for volume <VOLNAME>",
         },
         { .key = {"scrub-state"},
           .type = GF_OPTION_TYPE_STR,
           .default_value = "active",
+          .op_version = {GD_OP_VERSION_4_0_0},
+          .flags = OPT_FLAG_SETTABLE,
           .description = "Pause/Resume scrub. Upon resume, scrubber "
                          "continues from where it left off.",
         },
-- 
cgit