From 6556b5cf4077dc45a4c59d2d9ee2f23f5d0a80b0 Mon Sep 17 00:00:00 2001 From: Krutika Dhananjay Date: Thu, 2 May 2013 17:48:51 +0530 Subject: glusterd: delete "volume-name" from dict before processing the next option Change-Id: Ib78963c1f43a66dab50b443742979c7c4e4cbc23 BUG: 958790 Signed-off-by: Krutika Dhananjay Reviewed-on: http://review.gluster.org/4940 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi Reviewed-by: Vijay Bellur --- tests/bugs/bug-958790.t | 21 +++++++++++++++++++++ xlators/mgmt/glusterd/src/glusterd-volgen.c | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 tests/bugs/bug-958790.t diff --git a/tests/bugs/bug-958790.t b/tests/bugs/bug-958790.t new file mode 100644 index 000000000..6cc799c25 --- /dev/null +++ b/tests/bugs/bug-958790.t @@ -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; diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index e573497bf..56ce6b3a1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -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; } -- cgit