|
 |
9f5ccc |
From a4f01ad90a0c0dfd0655da509c5ed2a11a507cc3 Mon Sep 17 00:00:00 2001
|
|
|
9f5ccc |
From: Mohit Agrawal <moagrawal@redhat.com>
|
|
|
9f5ccc |
Date: Mon, 17 Jun 2019 11:10:42 +0530
|
|
|
9f5ccc |
Subject: [PATCH 326/335] tests: subdir-mount.t is failing for brick_mux
|
|
|
9f5ccc |
regrssion
|
|
|
9f5ccc |
|
|
|
9f5ccc |
To avoid the failure wait to run hook script S13create-subdir-mounts.sh
|
|
|
9f5ccc |
after executed add-brick command by test case.
|
|
|
9f5ccc |
|
|
|
9f5ccc |
This is required as a dependency for the bz referenced below.
|
|
|
9f5ccc |
|
|
|
9f5ccc |
Backport of https://review.gluster.org/c/glusterfs/+/22877
|
|
|
9f5ccc |
|
|
|
9f5ccc |
Change-Id: I063b6d0f86a550ed0a0527255e4dfbe8f0a8c02e
|
|
|
9f5ccc |
BUG: 1686800
|
|
|
9f5ccc |
Signed-off-by: Mohit Agrawal <moagrawal@redhat.com>
|
|
|
9f5ccc |
Reviewed-on: https://code.engineering.redhat.com/gerrit/185857
|
|
|
9f5ccc |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
9f5ccc |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
9f5ccc |
---
|
|
|
9f5ccc |
tests/features/subdir-mount.t | 11 ++++++++---
|
|
|
9f5ccc |
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
9f5ccc |
|
|
|
9f5ccc |
diff --git a/tests/features/subdir-mount.t b/tests/features/subdir-mount.t
|
|
|
9f5ccc |
index 8401946..a02bd6b 100644
|
|
|
9f5ccc |
--- a/tests/features/subdir-mount.t
|
|
|
9f5ccc |
+++ b/tests/features/subdir-mount.t
|
|
|
9f5ccc |
@@ -85,12 +85,17 @@ TEST $CLI volume start $V0
|
|
|
9f5ccc |
TEST $GFS --subdir-mount /subdir1/subdir1.1/subdir1.2 -s $H0 --volfile-id $V0 $M2
|
|
|
9f5ccc |
TEST stat $M2
|
|
|
9f5ccc |
|
|
|
9f5ccc |
+initcnt=`grep -i create-subdir-mounts /var/log/glusterfs/glusterd.log | wc -l`
|
|
|
9f5ccc |
# mount shouldn't fail even after add-brick
|
|
|
9f5ccc |
TEST $CLI volume add-brick $V0 replica 2 $H0:$B0/${V0}{5,6};
|
|
|
9f5ccc |
|
|
|
9f5ccc |
-# Give time for client process to get notified and use the new
|
|
|
9f5ccc |
-# volfile after add-brick
|
|
|
9f5ccc |
-sleep 1
|
|
|
9f5ccc |
+# Wait to execute create-subdir-mounts.sh script by glusterd
|
|
|
9f5ccc |
+newcnt=`grep -i create-subdir-mounts /var/log/glusterfs/glusterd.log | wc -l`
|
|
|
9f5ccc |
+while [ $newcnt -eq $initcnt ]
|
|
|
9f5ccc |
+do
|
|
|
9f5ccc |
+ newcnt=`grep -i create-subdir-mounts /var/log/glusterfs/glusterd.log | wc -l`
|
|
|
9f5ccc |
+ sleep 1
|
|
|
9f5ccc |
+done
|
|
|
9f5ccc |
|
|
|
9f5ccc |
# Existing mount should still be active
|
|
|
9f5ccc |
mount_inode=$(stat --format "%i" "$M2")
|
|
|
9f5ccc |
--
|
|
|
9f5ccc |
1.8.3.1
|
|
|
9f5ccc |
|