andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glusterd: delete "volume-name" from dict before processing the next option

Browse Source 
Change-Id: Ib78963c1f43a66dab50b443742979c7c4e4cbc23
BUG: 958790
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/4940
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
This commit is contained in:
Krutika Dhananjay 2013-05-02 17:48:51 +05:30 committed by Vijay Bellur
parent 254181428e
commit 6556b5cf40
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/bugs/bug-958790.t Normal file
View File

@ -0,0 +1,21 @@
#!/bin/bash
. $(dirname $0)/../include.rc
. $(dirname $0)/../volume.rc
cleanup;
TEST glusterd;
TEST pidof glusterd;
TEST $CLI volume info;
touch /var/lib/glusterd/groups/test
echo "read-ahead=off" > /var/lib/glusterd/groups/test
echo "open-behind=off" >> /var/lib/glusterd/groups/test
TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
TEST $CLI volume set $V0 group test
EXPECT "off" volume_option $V0 performance.read-ahead
EXPECT "off" volume_option $V0 performance.open-behind
cleanup;

2
xlators/mgmt/glusterd/src/glusterd-volgen.c
View File

@ -3453,6 +3453,8 @@ validate_nfsopts (glusterd_volinfo_t *volinfo,
volgen_graph_free (&graph);
out:
if (dict_get (val_dict, "volume-name"))
dict_del (val_dict, "volume-name");
gf_log (this->name, GF_LOG_DEBUG, "Returning %d", ret);
return ret;
}