|
 |
12a457 |
From 58ca36024986ce577cce7589709bdb707cb775e8 Mon Sep 17 00:00:00 2001
|
|
|
12a457 |
From: Vijay Bellur <vbellur@redhat.com>
|
|
|
12a457 |
Date: Fri, 8 Apr 2016 21:59:53 -0400
|
|
|
12a457 |
Subject: [PATCH 088/104] extras: Add namespace for options in group-virt.example
|
|
|
12a457 |
|
|
|
12a457 |
Commit 23ccabbeb7 introduced a new key "disperse.eager-lock" which
|
|
|
12a457 |
causes a conflict with key "cluster.eager-lock" when option is used
|
|
|
12a457 |
without the qualifying namespace. group-virt.example which gets
|
|
|
12a457 |
installed as /var/lib/glusterd/ groups/virt contains options without
|
|
|
12a457 |
namespace qualifiers. This patch adds the appropriate namespace to all
|
|
|
12a457 |
options in group-virt.example.
|
|
|
12a457 |
|
|
|
12a457 |
Change-Id: I2c09dd10d44138410d889ddeb805f01c641c6780
|
|
|
12a457 |
BUG: 1329895
|
|
|
12a457 |
Signed-off-by: Vijay Bellur <vbellur@redhat.com>
|
|
|
12a457 |
Signed-off-by: Kaushal M <kaushal@redhat.com>
|
|
|
12a457 |
Reviewed-upstream-on: http://review.gluster.org/13958
|
|
|
12a457 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/72923
|
|
|
12a457 |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
12a457 |
Tested-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
12a457 |
---
|
|
|
12a457 |
extras/group-virt.example | 16 ++++++++--------
|
|
|
12a457 |
tests/bugs/glusterd/bug-1314649-group-virt.t | 14 ++++++++++++++
|
|
|
12a457 |
tests/include.rc | 5 +++--
|
|
|
12a457 |
3 files changed, 25 insertions(+), 10 deletions(-)
|
|
|
12a457 |
create mode 100644 tests/bugs/glusterd/bug-1314649-group-virt.t
|
|
|
12a457 |
|
|
|
12a457 |
diff --git a/extras/group-virt.example b/extras/group-virt.example
|
|
|
12a457 |
index 0abe9f4..b699c9e 100644
|
|
|
12a457 |
--- a/extras/group-virt.example
|
|
|
12a457 |
+++ b/extras/group-virt.example
|
|
|
12a457 |
@@ -1,8 +1,8 @@
|
|
|
12a457 |
-quick-read=off
|
|
|
12a457 |
-read-ahead=off
|
|
|
12a457 |
-io-cache=off
|
|
|
12a457 |
-stat-prefetch=off
|
|
|
12a457 |
-eager-lock=enable
|
|
|
12a457 |
-remote-dio=enable
|
|
|
12a457 |
-quorum-type=auto
|
|
|
12a457 |
-server-quorum-type=server
|
|
|
12a457 |
+performance.quick-read=off
|
|
|
12a457 |
+performance.read-ahead=off
|
|
|
12a457 |
+performance.io-cache=off
|
|
|
12a457 |
+performance.stat-prefetch=off
|
|
|
12a457 |
+cluster.eager-lock=enable
|
|
|
12a457 |
+network.remote-dio=enable
|
|
|
12a457 |
+cluster.quorum-type=auto
|
|
|
12a457 |
+cluster.server-quorum-type=server
|
|
|
12a457 |
diff --git a/tests/bugs/glusterd/bug-1314649-group-virt.t b/tests/bugs/glusterd/bug-1314649-group-virt.t
|
|
|
12a457 |
new file mode 100644
|
|
|
12a457 |
index 0000000..257e784
|
|
|
12a457 |
--- /dev/null
|
|
|
12a457 |
+++ b/tests/bugs/glusterd/bug-1314649-group-virt.t
|
|
|
12a457 |
@@ -0,0 +1,14 @@
|
|
|
12a457 |
+#!/bin/bash
|
|
|
12a457 |
+
|
|
|
12a457 |
+. $(dirname $0)/../../include.rc
|
|
|
12a457 |
+. $(dirname $0)/../../volume.rc
|
|
|
12a457 |
+
|
|
|
12a457 |
+cleanup;
|
|
|
12a457 |
+
|
|
|
12a457 |
+TEST glusterd
|
|
|
12a457 |
+
|
|
|
12a457 |
+TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
|
|
|
12a457 |
+
|
|
|
12a457 |
+TEST $CLI volume set $V0 group virt;
|
|
|
12a457 |
+
|
|
|
12a457 |
+cleanup;
|
|
|
12a457 |
diff --git a/tests/include.rc b/tests/include.rc
|
|
|
12a457 |
index 03c9f44..9be67de 100644
|
|
|
12a457 |
--- a/tests/include.rc
|
|
|
12a457 |
+++ b/tests/include.rc
|
|
|
12a457 |
@@ -455,9 +455,10 @@ function cleanup()
|
|
|
12a457 |
;;
|
|
|
12a457 |
esac
|
|
|
12a457 |
|
|
|
12a457 |
- # remove contents of "GLUSTERD_WORKDIR" except hooks directory.
|
|
|
12a457 |
+ # remove contents of "GLUSTERD_WORKDIR" except hooks and groups
|
|
|
12a457 |
+ # directories.
|
|
|
12a457 |
find $GLUSTERD_WORKDIR/* -maxdepth 0 -name 'hooks' -prune \
|
|
|
12a457 |
- -o -exec rm -rf '{}' ';'
|
|
|
12a457 |
+ -o -name 'groups' -prune -o -exec rm -rf '{}' ';'
|
|
|
12a457 |
|
|
|
12a457 |
rm -rf $B0/* /etc/glusterd/*;
|
|
|
12a457 |
|
|
|
12a457 |
--
|
|
|
12a457 |
1.7.1
|
|
|
12a457 |
|