summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2014-08-30 16:15:36 +0530
committerVijay Bellur <vbellur@redhat.com>2015-03-24 06:53:11 -0700
commitef158c75d1d6fac76635e95a9a43145433169b44 (patch)
tree488c342d2890234017ac7a1ca7ca0d1485580117 /xlators/mgmt
parenta20101e2e4d5f5595655544cfc798eb1d445638c (diff)
read-only: read-only/worm translator should be in brick graph by default
Problem: read-only/worm translator is not loaded by default in brick graph because of which when read-only option is set through volume set volume still remains writable untill the bricks are restarted as the translator does not have an inmemory flag to decide whether the read-only/worm option is turned or not. Solution: read-only/worm should be loaded by default in brick graph and the read-only/worm option can be toggled through volume set command. read-only/worm translator now' has an in-memory flag to decide whether the volume is read-only or not and based on that either reject the fop or proceed. Change-Id: Ic79328698f6a72c50433cff15ecadb1a92acc643 BUG: 1134822 Signed-off-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-on: http://review.gluster.org/8571 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mgmt')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c31
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c5
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