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

extras: Add namespace for options in group-virt.example

Browse Source 
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:
Vijay Bellur 2016-04-08 21:59:53 -04:00 committed by Pranith Kumar Karampuri
parent 5ff451beec
commit 09c9da3b12
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extras/group-virt.example
View File

@ -1,8 +1,8 @@
quick-read=off performance.quick-read=off
read-ahead=off performance.read-ahead=off
io-cache=off performance.io-cache=off
stat-prefetch=off performance.stat-prefetch=off
eager-lock=enable cluster.eager-lock=enable
remote-dio=enable network.remote-dio=enable
quorum-type=auto cluster.quorum-type=auto
server-quorum-type=server cluster.server-quorum-type=server

14
tests/bugs/glusterd/bug-1314649-group-virt.t Normal file
View 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;

5
tests/include.rc
View File

@ -512,11 +512,12 @@ function cleanup()
;; ;;
esac esac
# remove contents of "GLUSTERD_WORKDIR" except hooks directory. # remove contents of "GLUSTERD_WORKDIR" except hooks and groups
# directories.
if [ -n $GLUSTERD_WORKDIR ] if [ -n $GLUSTERD_WORKDIR ]
then then
find $GLUSTERD_WORKDIR/* -maxdepth 0 -name 'hooks' -prune \ find $GLUSTERD_WORKDIR/* -maxdepth 0 -name 'hooks' -prune \
-o -exec rm -rf '{}' ';' -o -name 'groups' -prune -o -exec rm -rf '{}' ';'
else else
echo "GLUSTERD_WORKDIR is not set" echo "GLUSTERD_WORKDIR is not set"
fi fi