From: Anand Jain <anand.jain@oracle.com>
To: fstests@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org
Subject: [PATCH v2] btrfs/124: add balance --full-balance option
Date: Tue, 5 Dec 2017 19:36:32 +0800 [thread overview]
Message-ID: <20171205113632.12589-1-anand.jain@oracle.com> (raw)
In-Reply-To: <20171205082628.1676-1-anand.jain@oracle.com>
btrfs balance needs --full-balance option since 4.6, so check the
version and then use it.
As this may be useful for other btrfs tests as well, so this patch
also adds _run_btrfs_balance_start() to the common/btrfs file.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v2: Use help to find if --full-balance is supported
Make a local variable
run the balance instead of getting the options
common/btrfs | 11 +++++++++++
tests/btrfs/124 | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/common/btrfs b/common/btrfs
index c09206c6f292..c3a62b29c70e 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -356,3 +356,14 @@ _btrfs_compression_algos()
echo "${feature#/sys/fs/btrfs/features/compress_}"
done
}
+
+#runs btrfs balance start with required --full-balance if available.
+_run_btrfs_balance_start()
+{
+ local bal_opt=""
+
+ $BTRFS_UTIL_PROG balance start --help | grep -q "full-balance"
+ (( $? == 0 )) && bal_opt="--full-balance"
+
+ run_check $BTRFS_UTIL_PROG balance start $bal_opt $*
+}
diff --git a/tests/btrfs/124 b/tests/btrfs/124
index a6486270a972..94c35fe1ede8 100755
--- a/tests/btrfs/124
+++ b/tests/btrfs/124
@@ -129,7 +129,7 @@ _run_btrfs_util_prog device scan
_scratch_mount >> $seqres.full 2>&1
_run_btrfs_util_prog filesystem show
echo >> $seqres.full
-_run_btrfs_util_prog balance start ${SCRATCH_MNT}
+_run_btrfs_balance_start ${SCRATCH_MNT}
checkpoint2=`md5sum $SCRATCH_MNT/tf2`
echo $checkpoint2 >> $seqres.full 2>&1
--
2.15.0
prev parent reply other threads:[~2017-12-05 11:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-05 8:26 [PATCH] btrfs/124: add balance --full-balance option Anand Jain
2017-12-05 8:30 ` Qu Wenruo
2017-12-05 8:40 ` Eryu Guan
2017-12-05 9:02 ` Anand Jain
2017-12-05 8:54 ` Anand Jain
2017-12-05 11:36 ` Anand Jain [this message]
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=20171205113632.12589-1-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=fstests@vger.kernel.org \
--cc=linux-btrfs@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;
as well as URLs for NNTP newsgroup(s).