From patchwork Mon Oct 6 10:04:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 5035971 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AB8A09F2F1 for ; Mon, 6 Oct 2014 10:05:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C22EA2017D for ; Mon, 6 Oct 2014 10:05:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A62AB201BC for ; Mon, 6 Oct 2014 10:05:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752003AbaJFKFU (ORCPT ); Mon, 6 Oct 2014 06:05:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1147 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751705AbaJFKFS (ORCPT ); Mon, 6 Oct 2014 06:05:18 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s96A5I1W001460 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 6 Oct 2014 06:05:18 -0400 Received: from localhost (dhcp-12-153.nay.redhat.com [10.66.12.153]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s96A5Gxd002146; Mon, 6 Oct 2014 06:05:17 -0400 From: Eryu Guan To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Eryu Guan Subject: [PATCH v5 02/15] btrfs: new test to run btrfs balance and scrub simultaneously Date: Mon, 6 Oct 2014 18:04:41 +0800 Message-Id: <1412589894-10675-3-git-send-email-eguan@redhat.com> In-Reply-To: <1412589894-10675-1-git-send-email-eguan@redhat.com> References: <1412589894-10675-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_RHS_DOB autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Run btrfs balance and scrub operations simultaneously with fsstress running in background. Reviewed-by: Josef Bacik Signed-off-by: Eryu Guan --- common/rc | 9 +++++ tests/btrfs/061 | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/061.out | 2 + tests/btrfs/group | 1 + 4 files changed, 126 insertions(+) create mode 100755 tests/btrfs/061 create mode 100644 tests/btrfs/061.out diff --git a/common/rc b/common/rc index fb7892b..fac1fad 100644 --- a/common/rc +++ b/common/rc @@ -2588,6 +2588,15 @@ _btrfs_stress_subvolume() done } +# stress btrfs by running scrub in a loop +_btrfs_stress_scrub() +{ + local btrfs_mnt=$1 + while true; do + $BTRFS_UTIL_PROG scrub start -B $btrfs_mnt + done +} + init_rc() { if [ "$iam" == new ] diff --git a/tests/btrfs/061 b/tests/btrfs/061 new file mode 100755 index 0000000..e0e03d7 --- /dev/null +++ b/tests/btrfs/061 @@ -0,0 +1,114 @@ +#! /bin/bash +# FSQA Test No. btrfs/061 +# +# Run btrfs balance and scrub operations simultaneously with fsstress +# running in background. +# +#----------------------------------------------------------------------- +# Copyright (C) 2014 Red Hat Inc. All rights reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs btrfs +_supported_os Linux +# we check scratch dev after each loop +_require_scratch_nocheck +_require_scratch_dev_pool 4 +_btrfs_get_profile_configs + +rm -f $seqres.full + +run_test() +{ + local mkfs_opts=$1 + + echo "Test $mkfs_opts" >>$seqres.full + + _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1 + # make sure we created btrfs with desired options + if [ $? -ne 0 ]; then + echo "mkfs $mkfs_opts failed" + return + fi + _scratch_mount >>$seqres.full 2>&1 + + args=`_scale_fsstress_args -p 20 -n 100 $FSSTRESS_AVOID -d $SCRATCH_MNT/stressdir` + echo "Run fsstress $args" >>$seqres.full + $FSSTRESS_PROG $args >/dev/null 2>&1 & + fsstress_pid=$! + + echo -n "Start balance worker: " >>$seqres.full + _btrfs_stress_balance $SCRATCH_MNT >/dev/null 2>&1 & + balance_pid=$! + echo "$balance_pid" >>$seqres.full + + echo -n "Start scrub worker: " >>$seqres.full + _btrfs_stress_scrub $SCRATCH_MNT >/dev/null 2>&1 & + scrub_pid=$! + echo "$scrub_pid" >>$seqres.full + + echo "Wait for fsstress to exit and kill all background workers" >>$seqres.full + wait $fsstress_pid + kill $balance_pid $scrub_pid + wait + # wait for the balance and scrub operations to finish + while ps aux | grep "balance start" | grep -qv grep; do + sleep 1 + done + while ps aux | grep "scrub start" | grep -qv grep; do + sleep 1 + done + + echo "Scrub the filesystem" >>$seqres.full + $BTRFS_UTIL_PROG scrub start -B $SCRATCH_MNT >>$seqres.full 2>&1 + if [ $? -ne 0 ]; then + echo "Scrub find errors in \"$mkfs_opts\" test" | tee -a $seqres.full + fi + + _scratch_unmount + # we called _require_scratch_nocheck instead of _require_scratch + # do check after test for each profile config + _check_scratch_fs +} + +echo "Silence is golden" +for t in "${_btrfs_profile_configs[@]}"; do + run_test "$t" +done + +status=0 +exit diff --git a/tests/btrfs/061.out b/tests/btrfs/061.out new file mode 100644 index 0000000..273be9e --- /dev/null +++ b/tests/btrfs/061.out @@ -0,0 +1,2 @@ +QA output created by 061 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index bcc4d46..5064ef3 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -63,3 +63,4 @@ 058 auto quick 059 auto quick 060 auto balance subvol +061 auto balance scrub