From ef3331e703a8fa988bc09129f6f8d8f7c4c4082f Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Thu, 26 Mar 2020 13:48:19 -0400 Subject: [PATCH] ZTS: Wait for free space between quota tests And in removal tests, sync the specific pool we are waiting on. Reviewed-by: John Kennedy Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #10146 --- .../tests/functional/quota/quota_001_pos.ksh | 3 ++- .../tests/functional/quota/quota_002_pos.ksh | 3 +++ .../tests/functional/quota/quota_003_pos.ksh | 11 ++++++----- .../tests/functional/quota/quota_004_pos.ksh | 3 +++ .../zfs-tests/tests/functional/removal/removal.kshlib | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tests/zfs-tests/tests/functional/quota/quota_001_pos.ksh b/tests/zfs-tests/tests/functional/quota/quota_001_pos.ksh index 9364a9f60f..d6783e9a43 100755 --- a/tests/zfs-tests/tests/functional/quota/quota_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/quota/quota_001_pos.ksh @@ -62,7 +62,8 @@ function cleanup # pool, otherwise next test will fail trying to set a # quota which is less than the space used. # - sleep 5 + wait_freeing $TESTPOOL + sync_pool $TESTPOOL } log_onexit cleanup diff --git a/tests/zfs-tests/tests/functional/quota/quota_002_pos.ksh b/tests/zfs-tests/tests/functional/quota/quota_002_pos.ksh index c54968bbcc..2f34072dd1 100755 --- a/tests/zfs-tests/tests/functional/quota/quota_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/quota/quota_002_pos.ksh @@ -61,6 +61,9 @@ function cleanup [[ -e $TESTDIR/$TESTFILE2 ]] && \ log_must rm $TESTDIR/$TESTFILE2 + + wait_freeing $TESTPOOL + sync_pool $TESTPOOL } log_onexit cleanup diff --git a/tests/zfs-tests/tests/functional/quota/quota_003_pos.ksh b/tests/zfs-tests/tests/functional/quota/quota_003_pos.ksh index bec2243f9f..6ab25cf2d4 100755 --- a/tests/zfs-tests/tests/functional/quota/quota_003_pos.ksh +++ b/tests/zfs-tests/tests/functional/quota/quota_003_pos.ksh @@ -61,11 +61,12 @@ function cleanup log_must rm $TESTDIR1/$TESTFILE1 # - # Need to allow time for space to be released back to - # pool, otherwise next test will fail trying to set a - # quota which is less than the space used. - # - sleep 5 + # Need to allow time for space to be released back to + # pool, otherwise next test will fail trying to set a + # quota which is less than the space used. + # + wait_freeing $TESTPOOL + sync_pool $TESTPOOL } log_onexit cleanup diff --git a/tests/zfs-tests/tests/functional/quota/quota_004_pos.ksh b/tests/zfs-tests/tests/functional/quota/quota_004_pos.ksh index cc62d8fa96..3733544389 100755 --- a/tests/zfs-tests/tests/functional/quota/quota_004_pos.ksh +++ b/tests/zfs-tests/tests/functional/quota/quota_004_pos.ksh @@ -62,6 +62,9 @@ function cleanup [[ -e $TESTDIR1/$TESTFILE2 ]] && \ log_must rm $TESTDIR1/$TESTFILE2 + + wait_freeing $TESTPOOL + sync_pool $TESTPOOL } log_onexit cleanup diff --git a/tests/zfs-tests/tests/functional/removal/removal.kshlib b/tests/zfs-tests/tests/functional/removal/removal.kshlib index 231991e82c..140ac38ad8 100644 --- a/tests/zfs-tests/tests/functional/removal/removal.kshlib +++ b/tests/zfs-tests/tests/functional/removal/removal.kshlib @@ -34,7 +34,7 @@ function wait_for_removal # pool # The pool state changes before the TXG finishes syncing; wait for # the removal to be completed on disk. # - sync_pool + sync_pool $pool log_must is_pool_removed $pool return 0