diff options
author | Kaushal M <kaushal@redhat.com> | 2013-04-19 15:16:56 +0530 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2013-05-28 22:01:43 -0700 |
commit | 7d0cf52a344e476963fe97e71f86488d5bb17b1c (patch) | |
tree | 393e54f17ff9ef176b66165715abfc45875a424d /xlators/mgmt/glusterd/src/glusterd-volgen.c | |
parent | ea982a764b7cb447eb866129fef2cfafaa48eb6a (diff) |
glusterd-volgen: Enable open-behind based on op-version
This patch enables the open-behind by default only when the op-version
allows it. Also the volume op-version calculations take account of this
enablement.
Change-Id: Idf7a3c274ec4828aafc815cdd1df829ecb853354
BUG: 954256
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: http://review.gluster.org/4866
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 56ce6b3a108..72bd36d3a07 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -460,6 +460,8 @@ process_option (char *key, data_t *value, void *param) vme.key = key; vme.voltype = odt->vme->voltype; vme.option = odt->vme->option; + vme.op_version = odt->vme->op_version; + if (!vme.option) { vme.option = strrchr (key, '.'); if (vme.option) @@ -1674,6 +1676,12 @@ perfxl_option_handler (volgen_graph_t *graph, struct volopt_map_entry *vme, { char *volname = NULL; gf_boolean_t enabled = _gf_false; + xlator_t *this = NULL; + glusterd_conf_t *conf = NULL; + + this = THIS; + GF_ASSERT (this); + conf = this->private; volname = param; @@ -1685,6 +1693,12 @@ perfxl_option_handler (volgen_graph_t *graph, struct volopt_map_entry *vme, if (!enabled) return 0; + /* Check op-version before adding the 'open-behind' xlator in the graph + */ + if (!strcmp (vme->key, "performance.open-behind") && + (vme->op_version > conf->op_version)) + return 0; + if (volgen_graph_add (graph, vme->voltype, volname)) return 0; else |