summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xtests/basic/mount-nfs-auth.t51
-rwxr-xr-xtests/basic/quota-ancestry-building.t2
-rwxr-xr-xtests/features/trash.t8
3 files changed, 36 insertions, 25 deletions
diff --git a/tests/basic/mount-nfs-auth.t b/tests/basic/mount-nfs-auth.t
index 759bb92efbe..021169e7bff 100755
--- a/tests/basic/mount-nfs-auth.t
+++ b/tests/basic/mount-nfs-auth.t
@@ -90,7 +90,7 @@ function bg_write () {
}
function big_write() {
- dd if=/dev/zero of=$N0/test-big-write count=500 bs=1M
+ dd if=/dev/zero of=$N0/test-big-write count=500 bs=1024k
}
function create () {
@@ -103,9 +103,17 @@ function stat_nfs () {
# Restarts the NFS server
function restart_nfs () {
- PID=$(ps aux | grep nfs | grep sbin/glusterfs | awk '{print $2}')
- CMD=$(ps ax | grep nfs | grep sbin/glusterfs | awk '{$1=$2=$3=$4="";print $0}')
+ PID=$(ps auxww | grep nfs | grep sbin/glusterfs | awk '{print $2}')
+ CMD=$(ps axww | grep nfs | grep sbin/glusterfs | \
+ awk '{$1=""; $2=""; $3=""; $4=""; print $0}' | \
+ sed 's/ *([^()]*)$//')
kill $PID
+ timeout=$PROCESS_UP_TIMEOUT;
+ while kill -0 $PID 2>/dev/null; do
+ test $timeout -eq 0 && break
+ timout=$(( $timeout - 1 ))
+ sleep 1
+ done
$CMD
}
@@ -116,6 +124,7 @@ TEST $CLI vol set $V0 cluster.self-heal-daemon off
TEST $CLI vol set $V0 nfs.disable off
TEST $CLI vol set $V0 cluster.choose-local off
TEST $CLI vol start $V0
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
# Get NFS state directory
NFSDIR=$( $CLI volume get patchy nfs.mount-rmtab | \
@@ -129,7 +138,7 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
## Do some tests to verify that.
TEST do_mount $V0
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
## Disallow host
TEST export_deny_this_host
@@ -140,9 +149,9 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
## able to do mounts, writes, etc.
TEST do_mount $V0
TEST small_write
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
TEST do_mount $V0
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
## Reauthorize this host
export_allow_this_host
@@ -170,7 +179,7 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
## Writes should not be allowed, host is not authorized
TEST ! small_write
## Unmount so we can test mount
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
## Subsequent ounts should not be allowed, host is not authorized
TEST ! do_mount $V0
@@ -182,7 +191,7 @@ $CLI vol start $V0
EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
TEST do_mount $V0
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
## Allow host in netgroups but not in exports, host should be allowed
TEST export_deny_this_host
@@ -193,7 +202,7 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
TEST do_mount $V0
TEST small_write
TEST big_write
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
## Allow host in exports but not in netgroups, host should be allowed
TEST export_allow_this_host
@@ -202,28 +211,29 @@ $CLI vol stop $V0
$CLI vol start $V0
EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
TEST do_mount $V0
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
## Finally, reauth the host in export and netgroup, test mount & write
TEST export_allow_this_host_l1
TEST netgroup_allow_this_host
$CLI vol stop $V0
$CLI vol start $V0
-sleep 2
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
TEST do_mount $V0L1
TEST small_write
## Failover test: Restarting NFS and then doing a write should pass
bg_write
TEST restart_nfs
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
TEST wait $BG_WRITE_PID
TEST small_write
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
## Test deep mounts
TEST do_mount $V0L1
TEST small_write
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
TEST export_allow_this_host_ro
TEST netgroup_deny_this_host
@@ -234,7 +244,7 @@ TEST do_mount $V0
TEST ! small_write # Writes should not be allowed
TEST ! create # Create should not be allowed
TEST stat_nfs # Stat should be allowed
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
TEST export_deny_this_host
TEST netgroup_deny_this_host
@@ -244,7 +254,7 @@ $CLI vol start $V0
EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
TEST ! do_mount $V0 #V0 shouldnt be allowed
TEST do_mount $V0L1 #V0L1 should be
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
## Test wildcard hosts
TEST export_allow_wildcard
@@ -253,13 +263,13 @@ $CLI vol start $V0
EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
TEST do_mount $V0
TEST small_write
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
## Test if path is parsed correctly
## by mounting host:vol/ instead of host:vol
TEST do_mount $V0/
TEST small_write
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
TEST export_allow_this_host_with_slash
$CLI vol stop $V0
@@ -268,16 +278,17 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
TEST do_mount $V0
TEST small_write
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
TEST do_mount $V0/
TEST small_write
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
## Turn off exports authentication
$CLI vol stop $V0
TEST $CLI vol set $V0 nfs.exports-auth-enable off
$CLI vol start $V0
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
TEST export_deny_this_host # Deny the host
TEST netgroup_deny_this_host
@@ -286,7 +297,7 @@ $CLI vol start $V0
EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available
TEST do_mount $V0 # Do a mount & test
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
## Turn back on the exports authentication
$CLI vol stop $V0
diff --git a/tests/basic/quota-ancestry-building.t b/tests/basic/quota-ancestry-building.t
index e3817b2bd8c..1633e497922 100755
--- a/tests/basic/quota-ancestry-building.t
+++ b/tests/basic/quota-ancestry-building.t
@@ -37,7 +37,7 @@ TEST fd_open 5 'w' "$M0/$deep/file3"
TEST fd_open 6 'w' "$M0/$deep/file4"
# consume all quota
-TEST ! dd if=/dev/zero of="$M0/$deep/file" bs=1MB count=1
+TEST ! dd if=/dev/zero of="$M0/$deep/file" bs=1000000 count=1
# simulate name-less lookups for re-open where the parent information is lost.
# Stopping and starting the bricks will trigger client re-open which happens on
diff --git a/tests/features/trash.t b/tests/features/trash.t
index e0b85dafaf0..cbcff237f35 100755
--- a/tests/features/trash.t
+++ b/tests/features/trash.t
@@ -51,9 +51,9 @@ truncate_op() {
sleep 2
test -e $M0/$1
- test $(du -b $M0/$1 | awk '{print $1}') -eq 2 &>/dev/null
+ test $(ls -l $M0/$1 | awk '{print $5}') -eq 2 &>/dev/null
test -e $M0/.trashcan/$1*
- test $(du -b $M0/.trashcan/$1*|awk '{print $1}') -eq $2 &>/dev/null
+ test $(ls -l $M0/.trashcan/$1*|awk '{print $5}') -eq $2 &>/dev/null
# truncate from trashcan
truncate -s 1 $M0/.trashcan/$1*
@@ -94,7 +94,7 @@ TEST unlink_op file1
TEST truncate_op file2 4
# create files directory hierarchy and check [16]
-mkdir $M0/1/2/3 -p
+mkdir -p $M0/1/2/3
create_files $M0/1/2/3/foo1 $M0/1/2/3/foo2
TEST file_exists 1/2/3/foo1 1/2/3/foo2
@@ -122,7 +122,7 @@ TEST [ ! -e $M0/.trashcan/a/test1* ]
# truncate from eliminate path [23-25]
truncate -s 2 $M0/a/test2
TEST [ -e $M0/a/test2 ]
-TEST [ `du -b $M0/a/test2 | awk '{print $1}'` -eq 2 ]
+TEST [ `ls -l $M0/a/test2 | awk '{print $5}'` -eq 2 ]
TEST [ ! -e $M0/.trashcan/a/test2* ]
# set internal op on [26-27]
generated by cgit (git 2.34.1) at 2024-05-08 17:01:39 +0000