summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMohit Agrawal <moagrawal@redhat.com>2018-08-04 12:05:03 +0530
committerAtin Mukherjee <amukherj@redhat.com>2018-08-10 17:51:37 +0000
commitbd8fc26a278697c30537d879ea5402db7ebab577 (patch)
tree65772cd64d48429c9e8ee90a9e1ee934cdee04b0 /tests
parenta6900e829484435c5bd5d8efe38490cab54ac442 (diff)
glusterd: Compare volume_id before start/attach a brick
Problem: After reboot a node brick is not coming up because fsid comparison is failed before start a brick Solution: Instead of comparing fsid compare volume_id to resolve the same because fsid is changed after reboot a node but volume_id persist as a xattr on brick_root path at the time of creating a volume. Change-Id: Ic289aab1b4ebfd83bbcae8438fee26ae61a0fff4 fixes: bz#1612418 Signed-off-by: Mohit Agrawal <moagrawal@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/bugs/glusterd/bug-1595320.t (renamed from tests/basic/bug-1595320.t)9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/basic/bug-1595320.t b/tests/bugs/glusterd/bug-1595320.t
index 9d856eeadec..f41df9d0ffa 100644
--- a/tests/basic/bug-1595320.t
+++ b/tests/bugs/glusterd/bug-1595320.t
@@ -1,8 +1,8 @@
#!/bin/bash
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-. $(dirname $0)/../snapshot.rc
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
cleanup
@@ -52,7 +52,7 @@ EXPECT 0 count_brick_processes
# Unmount 3rd brick root from node
brick_root=$L3
-TEST umount -l $brick_root 2>/dev/null
+_umount_lv 3
# Start the volume only 2 brick should be start
TEST $CLI volume start $V0 force
@@ -70,6 +70,7 @@ n=`ls -lrth /proc/$brick_pid/fd | grep -iw $L3 | grep -v ".glusterfs" | wc -l`
TEST [ $n -eq 0 ]
# Mount the brick root
+TEST mkdir -p $brick_root
TEST mount -t xfs -o nouuid /dev/test_vg_3/brick_lvm $brick_root
# Replace brick_pid file to test brick_attach code