summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVijay Bellur <vbellur@redhat.com>2015-04-18 18:40:55 +0530
committerRaghavendra Bhat <raghavendra@redhat.com>2015-04-29 07:03:11 -0700
commit797e923da9f5f1eca4a51da177b1a7cbef75b5ad (patch)
tree18765214d0605ee8c14c4516bdf6c6f0d6b3a08f /tests
parent6bde16f7dc4a43d85e488f25ad679abfd24e72d1 (diff)
tests: Await for graph switch before testing open fop count
In performance/open-behind.t, a test for open fop reaching the brick is done by switching off open-behind and performing a read operation. If the read operation is performed before a graph switch, the read happens on the old graph and hence open does not get accounted in the brick. To overcome this EXPECT_WITHIN 10 seconds has now been added to ensure that a graph switch has happened. The read operation happens subsequently after the graph switch. Cleaned up a "No volumes present" message from stderr while doing this. Change-Id: I1e1c0d7e4bd2057520b4dd46157d18f30837b8c9 BUG: 1213066 Signed-off-by: Vijay Bellur <vbellur@redhat.com> Reviewed-on: http://review.gluster.org/10293 Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com> Tested-by: Raghavendra Bhat <raghavendra@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/include.rc1
-rwxr-xr-xtests/performance/open-behind.t5
-rw-r--r--tests/volume.rc7
3 files changed, 12 insertions, 1 deletions
diff --git a/tests/include.rc b/tests/include.rc
index d4772bd42f4..94e4bc4bb67 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -65,6 +65,7 @@ JANITOR_TIMEOUT=60
UMOUNT_TIMEOUT=5
CONFIG_UPDATE_TIMEOUT=5
AUTH_REFRESH_INTERVAL=10
+GRAPH_SWITCH_TIMEOUT=10
statedumpdir=`gluster --print-statedumpdir`; # Default directory for statedump
diff --git a/tests/performance/open-behind.t b/tests/performance/open-behind.t
index 5a24c83954d..e7a2bcf788b 100755
--- a/tests/performance/open-behind.t
+++ b/tests/performance/open-behind.t
@@ -1,12 +1,13 @@
#!/bin/bash
. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
cleanup;
TEST glusterd
TEST pidof glusterd
-TEST $CLI volume info;
+TEST $CLI volume info 2>/dev/null;
TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
@@ -49,6 +50,8 @@ EXPECT "" echo $string;
TEST $CLI volume set $V0 performance.open-behind off;
+EXPECT_WITHIN $GRAPH_SWITCH_TIMEOUT "2" num_graphs $M0;
+
D1="hello-this-is-a-test-message1";
F1="test-file1";
diff --git a/tests/volume.rc b/tests/volume.rc
index f2a56888fb8..6c0e6abea83 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -506,3 +506,10 @@ function cleanup_georep {
$CLI volume geo-rep $GMV0 $H0::$GSV0 delete
}
+
+
+function num_graphs
+{
+ local mountpoint=$1
+ echo `ls $mountpoint/.meta/graphs/ | grep -v active | wc -l`
+}