extras: Add namespace for options in group-virt.example
Commit 23ccabbeb7
introduced a new key "disperse.eager-lock" which
causes a conflict with key "cluster.eager-lock" when option is used
without the qualifying namespace. group-virt.example which gets
installed as /var/lib/glusterd/ groups/virt contains options without
namespace qualifiers. This patch adds the appropriate namespace to all
options in group-virt.example.
Change-Id: I2c09dd10d44138410d889ddeb805f01c641c6780
BUG: 1314649
Signed-off-by: Vijay Bellur <vbellur@redhat.com>
Reviewed-on: http://review.gluster.org/13929
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
This commit is contained in:
parent
5ff451beec
commit
09c9da3b12
@ -1,8 +1,8 @@
|
||||
quick-read=off
|
||||
read-ahead=off
|
||||
io-cache=off
|
||||
stat-prefetch=off
|
||||
eager-lock=enable
|
||||
remote-dio=enable
|
||||
quorum-type=auto
|
||||
server-quorum-type=server
|
||||
performance.quick-read=off
|
||||
performance.read-ahead=off
|
||||
performance.io-cache=off
|
||||
performance.stat-prefetch=off
|
||||
cluster.eager-lock=enable
|
||||
network.remote-dio=enable
|
||||
cluster.quorum-type=auto
|
||||
cluster.server-quorum-type=server
|
||||
|
14
tests/bugs/glusterd/bug-1314649-group-virt.t
Normal file
14
tests/bugs/glusterd/bug-1314649-group-virt.t
Normal file
@ -0,0 +1,14 @@
|
||||
#!/bin/bash
|
||||
|
||||
. $(dirname $0)/../../include.rc
|
||||
. $(dirname $0)/../../volume.rc
|
||||
|
||||
cleanup;
|
||||
|
||||
TEST glusterd
|
||||
|
||||
TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
|
||||
|
||||
TEST $CLI volume set $V0 group virt;
|
||||
|
||||
cleanup;
|
@ -512,11 +512,12 @@ function cleanup()
|
||||
;;
|
||||
esac
|
||||
|
||||
# remove contents of "GLUSTERD_WORKDIR" except hooks directory.
|
||||
# remove contents of "GLUSTERD_WORKDIR" except hooks and groups
|
||||
# directories.
|
||||
if [ -n $GLUSTERD_WORKDIR ]
|
||||
then
|
||||
find $GLUSTERD_WORKDIR/* -maxdepth 0 -name 'hooks' -prune \
|
||||
-o -exec rm -rf '{}' ';'
|
||||
-o -name 'groups' -prune -o -exec rm -rf '{}' ';'
|
||||
else
|
||||
echo "GLUSTERD_WORKDIR is not set"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user