diff options
Diffstat (limited to 'tests/features/subdir-mount.t')
| -rw-r--r-- | tests/features/subdir-mount.t | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/tests/features/subdir-mount.t b/tests/features/subdir-mount.t index 2fb0be48bd3..a02bd6befc4 100644 --- a/tests/features/subdir-mount.t +++ b/tests/features/subdir-mount.t @@ -78,16 +78,38 @@ TEST ! $CLI volume set $V0 auth.allow "subdir2\(1.2.3.4\)" # support subdir inside subdir TEST $CLI volume set $V0 auth.allow '/subdir1/subdir1.1/subdir1.2/\(1.2.3.4\|::1\),/\(192.168.10.1\|192.168.11.1\),/subdir2\(1.2.3.4\)' -# /subdir2 has not allowed IP -TEST $GFS --subdir-mount /subdir2 -s $H0 --volfile-id $V0 $M1 -TEST stat $M1 +TEST $CLI volume stop $V0 + +TEST $CLI volume start $V0 TEST $GFS --subdir-mount /subdir1/subdir1.1/subdir1.2 -s $H0 --volfile-id $V0 $M2 TEST stat $M2 -# umount $M1 / $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}; + +# 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") +TEST test "$mount_inode" == "1" + +TEST umount $M2 + +# 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" + TEST umount $M0 -TEST umount $M1 TEST umount $M2 |