diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2017-08-17 10:54:02 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2017-08-18 06:36:34 +0000 |
| commit | 01abf7ee37702407403afcf9aa6c9019a0316e1d (patch) | |
| tree | 8e5f4da2d9a3707a126812cbdba5dc10fef7a31c | |
| parent | 3998c28324c8907b9b3ade75c98a6a0e4591f23b (diff) | |
| download | glusterfs-01abf7ee37702407403afcf9aa6c9019a0316e1d.tar.gz glusterfs-01abf7ee37702407403afcf9aa6c9019a0316e1d.tar.xz glusterfs-01abf7ee37702407403afcf9aa6c9019a0316e1d.zip | |
glusterd: disallow volume specific options to be set with all as volume name
All the .validate_fn defined in volume map entry table refers to volinfo
object. And if we end up in trying to set a volume level option cluster
wide glusterd results into a crash.
Change-Id: I7c877aee0ff5c8c1d8c95662fdc8c8923355ae7b
BUG: 1482344
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: https://review.gluster.org/18052
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Prashanth Pai <ppai@redhat.com>
Reviewed-by: mohammed rafi kc <rkavunga@redhat.com>
Reviewed-by: Gaurav Yadav <gyadav@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
| -rw-r--r-- | tests/bugs/glusterd/bug-1482344-volume-option-set-cluster-level.t | 25 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 8 |
2 files changed, 33 insertions, 0 deletions
diff --git a/tests/bugs/glusterd/bug-1482344-volume-option-set-cluster-level.t b/tests/bugs/glusterd/bug-1482344-volume-option-set-cluster-level.t new file mode 100644 index 0000000000..481dee186b --- /dev/null +++ b/tests/bugs/glusterd/bug-1482344-volume-option-set-cluster-level.t @@ -0,0 +1,25 @@ +#!/bin/bash + +#Test case: glusterd should disallow a volume level option to be set cluster +wide and glusterd should not crash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc + +cleanup; + +#Basic checks +TEST glusterd +TEST pidof glusterd + +#Create a 2x1 distributed volume +TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2}; +TEST $CLI volume start $V0 + +TEST ! $CLI volume set all transport.listen-backlog 128 + +# Check the volume info output, if glusterd would have crashed then this command +# will fail +TEST $CLI volume info $V0; + +cleanup; diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 410885e82d..69629f201a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -807,6 +807,14 @@ glusterd_volopt_validate (glusterd_volinfo_t *volinfo, dict_t *dict, char *key, if ((vme->validate_fn) && ((!strcmp (key, vme->key)) || (!strcmp (key, strchr (vme->key, '.') + 1)))) { + if ((vme->type != GLOBAL_DOC && + vme->type != GLOBAL_NO_DOC) && !volinfo) { + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_INVALID_ENTRY, "%s is not" + " a global option", vme->key); + ret = -1; + goto out; + } ret = vme->validate_fn (volinfo, dict, key, value, op_errstr); if (ret) |