summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjiffin <jthottan@redhat.com>2014-10-30 15:58:56 +0530
committerNiels de Vos <ndevos@redhat.com>2014-10-31 01:14:03 -0700
commita718a11a1c21c1f74460b61c98579db4ae2747ac (patch)
tree4d15610d38053bc9ad204c3a1fac93036a3f414a
parent4120e8a47a6d9b8cb3e4bf6f8ede6d26667fb673 (diff)
gNFS : mount fails if connection to brick(s) is not established yet.
Connection between gluster-nfs and brick process requires time (especially for rdma).During that time when we try to mount using nfs ,it will fail saying that volume not found. So we need a check using 'is_nfs_export_available'before mounting to ensure volume is available.This patch will provide the check before nfs mount if it is not given in the test files Change-Id: I242eb6e3118ebaca1df46314302a203a0c9738a8 BUG: 1158831 Signed-off-by: jiffin tony thottan <jthottan@redhat.com> Reviewed-on: http://review.gluster.org/9011 Reviewed-by: Meghana M <mmadhusu@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
-rw-r--r--tests/basic/nufa.t2
-rwxr-xr-xtests/basic/quota.t3
-rw-r--r--tests/basic/uss.t4
-rw-r--r--tests/basic/volume-status.t3
4 files changed, 11 insertions, 1 deletions
diff --git a/tests/basic/nufa.t b/tests/basic/nufa.t
index c368f87787e..ca4054a354d 100644
--- a/tests/basic/nufa.t
+++ b/tests/basic/nufa.t
@@ -27,6 +27,8 @@ TEST $GFS --read-only -s $H0 --volfile-id $V0 $M1;
## Wait for volume to register with rpc.mountd
sleep 5;
+##Wait for connection establishment between nfs server and brick process
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
## Mount NFS
TEST mount_nfs $H0:/$V0 $N0 nolock;
diff --git a/tests/basic/quota.t b/tests/basic/quota.t
index 89489b3951b..f4bcfdc0267 100755
--- a/tests/basic/quota.t
+++ b/tests/basic/quota.t
@@ -99,6 +99,9 @@ EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" usage "/test_dir"
# though this may change.
## -----------------------------
+##Wait for connection establishment between nfs server and brick process
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
+
TEST mount_nfs $H0:/$V0 $N0 nolock;
TEST $CLI volume quota $V0 limit-usage /test_dir 100MB
diff --git a/tests/basic/uss.t b/tests/basic/uss.t
index 2ce78bb682b..a83cbeddaee 100644
--- a/tests/basic/uss.t
+++ b/tests/basic/uss.t
@@ -98,7 +98,9 @@ TEST fd_close $fd3
# similar tests on nfs mount
-# test 44
+##Wait for connection establishment between nfs server and brick process
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
+#test 44
TEST mount_nfs $H0:/$V0 $N0 nolock;
NUM_SNAPS=$(ls $N0/.snaps | wc -l);
diff --git a/tests/basic/volume-status.t b/tests/basic/volume-status.t
index 41c0ceeaebe..bd85ab659bc 100644
--- a/tests/basic/volume-status.t
+++ b/tests/basic/volume-status.t
@@ -19,6 +19,9 @@ sleep 2
## Mount FUSE
TEST $GFS -s $H0 --volfile-id $V0 $M0;
+##Wait for connection establishment between nfs server and brick process
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
+
## Mount NFS
TEST mount_nfs $H0:/$V0 $N0 nolock;