diff options
| author | Gaurav Kumar Garg <ggarg@redhat.com> | 2014-09-10 17:33:20 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2014-09-25 22:52:08 -0700 |
| commit | 60a75cdca76b0a4b83eb6f5bc70a320d586d79aa (patch) | |
| tree | d032a0b708a70c9946ce0973807402e63ada50bd | |
| parent | adace43107e3a77dcb3d24c87e7a631c0f099602 (diff) | |
glusterd: file-snapshot and features-encryption options should be validate correctly
By giving non-boolean value to volume set command for features.file-snapshot
and features.encryption option the command failed after that subsequent
volume set request with valid value of the existing any volume set option
fail.
Previously when user supplies a non-boolean value in volume set command
for features.file-snapshot and features.encryption option's then
validation of that value was done by volinfo->dict but actual value
of that option store in input dictonary. Now with this change it
will refer correct dictonary for validation of supplies value.
Change-Id: I4a93d8be848cd33fdf4b4eb9b1a8d15ec9d1e66a
BUG: 1140162
Reviewed-on: http://review.gluster.org/8688
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Kaushal M <kaushal@redhat.com>
| -rw-r--r-- | tests/bugs/bug-1140162-file-snapshot-and-features-encryption-option-validation.t | 33 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 5 |
2 files changed, 36 insertions, 2 deletions
diff --git a/tests/bugs/bug-1140162-file-snapshot-and-features-encryption-option-validation.t b/tests/bugs/bug-1140162-file-snapshot-and-features-encryption-option-validation.t new file mode 100644 index 00000000000..a7aa883cba8 --- /dev/null +++ b/tests/bugs/bug-1140162-file-snapshot-and-features-encryption-option-validation.t @@ -0,0 +1,33 @@ +#!/bin/bash + +## Test case for BZ-1140160 Volume option set <vol> <file-snapshot> and +## <features.encryption> <value> command input should validate correctly. + +. $(dirname $0)/../include.rc +. $(dirname $0)/../volume.rc + +cleanup; + +## Start glusterd +TEST glusterd; +TEST pidof glusterd; + +## Lets create and start volume +TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2}; +TEST $CLI volume start $V0 + +## Set features.file-snapshot and features.encryption option with non-boolean +## value. These options should fail. +TEST ! $CLI volume set $V0 features.file-snapshot abcd +TEST ! $CLI volume set $V0 features.encryption redhat + +## Set other options with valid value. These options should succeed. +TEST $CLI volume set $V0 barrier enable +TEST $CLI volume set $V0 ping-timeout 60 + +## Set features.file-snapshot and features.encryption option with valid boolean +## value. These options should succeed. +TEST $CLI volume set $V0 features.file-snapshot on +TEST $CLI volume set $V0 features.encryption on + +cleanup; diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 7cd95fad5f2..476e3b0c1d9 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -2736,7 +2736,7 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, goto out; } - ret = glusterd_volinfo_get_boolean (volinfo, "features.encryption"); + ret = dict_get_str_boolean (set_dict, "features.encryption", _gf_false); if (ret == -1) goto out; if (ret) { @@ -2764,7 +2764,8 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, } - ret = glusterd_volinfo_get_boolean (volinfo, "features.file-snapshot"); + ret = dict_get_str_boolean (set_dict, "features.file-snapshot", + _gf_false); if (ret == -1) goto out; if (ret) { |