public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: Mark Fasheh <mfasheh@suse.de>
To: fstests@vger.kernel.org
Cc: Dave Chinner <david@fromorbit.com>
Subject: [PATCH] btrfs/104: remove ugly sleep
Date: Thu, 14 Apr 2016 16:04:09 -0700	[thread overview]
Message-ID: <20160414230409.GO2187@wotan.suse.de> (raw)

Latest btrfsprogs can now do 'subvolume sync' to wait on snapshots to be
dropped. Replace the sleep call in btrfs/104 with this. We can also add this
test to the 'quick' group now.

Signed-off-by: Mark Fasheh <mfasheh@suse.de>
---
 tests/btrfs/104   | 8 +++-----
 tests/btrfs/group | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/btrfs/104 b/tests/btrfs/104
index 6afaa02..627e77b 100755
--- a/tests/btrfs/104
+++ b/tests/btrfs/104
@@ -145,11 +145,9 @@ _scratch_cycle_mount
 # referenced above.
 _run_btrfs_util_prog subvolume delete $SCRATCH_MNT/snap1
 
-# There is no way from userspace to force btrfs_drop_snapshot to run
-# at a given time (even via mount/unmount). We must wait for it to
-# start and complete. This is the shortest time on my tests systems I
-# have found which always allows drop_snapshot to run to completion.
-sleep 45
+# Removing snapshots on btrfs is a delayed operation, so we must wait for
+# btrfs_drop_snapshot to complete.
+_run_btrfs_util_prog subvolume sync $SCRATCH_MNT
 
 _scratch_unmount
 
diff --git a/tests/btrfs/group b/tests/btrfs/group
index ef6c260..9403daa 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -104,7 +104,7 @@
 101 auto quick replace
 102 auto quick metadata enospc
 103 auto quick clone compress
-104 auto qgroup
+104 auto quick qgroup
 105 auto quick send
 106 auto quick clone compress
 107 auto quick prealloc
-- 
2.1.4


             reply	other threads:[~2016-04-14 23:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-14 23:04 Mark Fasheh [this message]
2016-04-15 11:04 ` [PATCH] btrfs/104: remove ugly sleep Filipe Manana
2016-04-15 23:52   ` Mark Fasheh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160414230409.GO2187@wotan.suse.de \
    --to=mfasheh@suse.de \
    --cc=david@fromorbit.com \
    --cc=fstests@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox