diff options
Diffstat (limited to 'tests/features/subdir-mount.t')
| -rw-r--r-- | tests/features/subdir-mount.t | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/tests/features/subdir-mount.t b/tests/features/subdir-mount.t index 1742f8655e8..a02bd6befc4 100644 --- a/tests/features/subdir-mount.t +++ b/tests/features/subdir-mount.t @@ -85,12 +85,17 @@ TEST $CLI volume start $V0 TEST $GFS --subdir-mount /subdir1/subdir1.1/subdir1.2 -s $H0 --volfile-id $V0 $M2 TEST stat $M2 +initcnt=`grep -i create-subdir-mounts /var/log/glusterfs/glusterd.log | wc -l` # mount shouldn't fail even after add-brick TEST $CLI volume add-brick $V0 replica 2 $H0:$B0/${V0}{5,6}; -# Give time for client process to get notified and use the new -# volfile after add-brick -sleep 1 +# Wait to execute create-subdir-mounts.sh script by glusterd +newcnt=`grep -i create-subdir-mounts /var/log/glusterfs/glusterd.log | wc -l` +while [ $newcnt -eq $initcnt ] +do + newcnt=`grep -i create-subdir-mounts /var/log/glusterfs/glusterd.log | wc -l` + sleep 1 +done # Existing mount should still be active mount_inode=$(stat --format "%i" "$M2") @@ -98,22 +103,14 @@ TEST test "$mount_inode" == "1" TEST umount $M2 -# because the subdir is not yet 'healed', below should fail. +# Now the exported subdirs should be automatically healed due to +# hook scripts. Check if the mount is successful. TEST $GFS --subdir-mount /subdir2 -s $H0 --volfile-id $V0 $M2 mount_inode=$(stat --format "%i" "$M2") -TEST test "$mount_inode" != "1" - -# Allow the heal to complete -TEST stat $M0/subdir1/subdir1.1/subdir1.2/subdir1.2_file; -TEST stat $M0/subdir2/ - -# Now the mount should succeed -TEST $GFS --subdir-mount /subdir2 -s $H0 --volfile-id $V0 $M1 -TEST stat $M1 +TEST test "$mount_inode" == "1" -# umount $M1 / $M2 TEST umount $M0 -TEST umount $M1 +TEST umount $M2 TEST $CLI volume stop $V0; |