diff options
Diffstat (limited to 'xlators/mgmt')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 31 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 5 |
2 files changed, 15 insertions, 21 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 3edd4e28009..d7709750129 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -1852,15 +1852,12 @@ brick_graph_add_ro (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, goto out; } - /* Check for read-only volume option, and add it to the graph */ - if (dict_get_str_boolean (set_dict, "features.read-only", 0)){ - xl = volgen_graph_add (graph, "features/read-only", - volinfo->volname); - if (!xl) { - ret = -1; - goto out; - } - } + xl = volgen_graph_add (graph, "features/read-only", volinfo->volname); + if (!xl) + return -1; + ret = xlator_set_option (xl, "read-only", "off"); + if (ret) + return -1; ret = 0; @@ -1886,15 +1883,9 @@ brick_graph_add_worm (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, goto out; } - /* Check for worm volume option, and add it to the graph */ - if (dict_get_str_boolean (set_dict, "features.worm", 0)) { - xl = volgen_graph_add (graph, "features/worm", - volinfo->volname); - if (!xl) { - ret = -1; - goto out; - } - } + xl = volgen_graph_add (graph, "features/worm", volinfo->volname); + if (!xl) + return -1; ret = 0; @@ -3399,6 +3390,10 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, ret = -1; goto out; } + ret = xlator_set_option (xl, "read-only", "on"); + if (ret) + goto out; + } /* Check for compress volume option, and add it to the graph on client side */ diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index 1e2bbcad265..d95f1fcaa0a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -1547,14 +1547,13 @@ struct volopt_map_entry glusterd_volopt_map[] = { /* Other options which don't fit any place above */ { .key = "features.read-only", .voltype = "features/read-only", - .option = "!read-only", - .value = "off", + .option = "read-only", .op_version = 1, .flags = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT }, { .key = "features.worm", .voltype = "features/worm", - .option = "!worm", + .option = "worm", .value = "off", .op_version = 2, .flags = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT |