From patchwork Thu Aug 28 13:47:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 4804641 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4DF99C0338 for ; Thu, 28 Aug 2014 13:49:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9F862016C for ; Thu, 28 Aug 2014 13:49:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D96822015E for ; Thu, 28 Aug 2014 13:49:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751686AbaH1Nst (ORCPT ); Thu, 28 Aug 2014 09:48:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25766 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751650AbaH1Nss (ORCPT ); Thu, 28 Aug 2014 09:48:48 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7SDmlZW023242 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 28 Aug 2014 09:48:47 -0400 Received: from localhost (dhcp-12-138.nay.redhat.com [10.66.12.138]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7SDmksu026776; Thu, 28 Aug 2014 09:48:47 -0400 From: Eryu Guan To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Eryu Guan Subject: [PATCH 03/15 v2] btrfs: new test to run btrfs balance and defrag operations simultaneously Date: Thu, 28 Aug 2014 21:47:44 +0800 Message-Id: <1409233676-22787-4-git-send-email-eguan@redhat.com> In-Reply-To: <1409233676-22787-1-git-send-email-eguan@redhat.com> References: <1409233676-22787-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY 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 defrag operations simultaneously with fsstress running in background. Signed-off-by: Eryu Guan --- common/rc | 18 ++++++++ tests/btrfs/061 | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/061.out | 2 + tests/btrfs/group | 1 + 4 files changed, 151 insertions(+) create mode 100755 tests/btrfs/061 create mode 100644 tests/btrfs/061.out diff --git a/common/rc b/common/rc index 9df331d..b0f5064 100644 --- a/common/rc +++ b/common/rc @@ -2406,6 +2406,24 @@ _btrfs_stress_scrub() done } +_btrfs_stress_defrag() +{ + local btrfs_mnt=$1 + local compress=$2 + + while true; do + if [ "$compress" == "nocompress" ]; then + find $btrfs_mnt \( -type f -o -type d \) -exec \ + $BTRFS_UTIL_PROG filesystem defrag {} \; + else + find $btrfs_mnt \( -type f -o -type d \) -exec \ + $BTRFS_UTIL_PROG filesystem defrag -clzo {} \; + find $btrfs_mnt \( -type f -o -type d \) -exec \ + $BTRFS_UTIL_PROG filesystem defrag -czlib {} \; + fi + done +} + init_rc() { if [ "$iam" == new ] diff --git a/tests/btrfs/061 b/tests/btrfs/061 new file mode 100755 index 0000000..965feed --- /dev/null +++ b/tests/btrfs/061 @@ -0,0 +1,130 @@ +#! /bin/bash +# FSQA Test No. btrfs/061 +# +# Run btrfs balance and defrag 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 -fr $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs btrfs +_supported_os Linux +_require_scratch +_require_scratch_dev_pool 4 + +rm -f $seqres.full + +# test case array +tcs=( + "-m single -d single" + "-m dup -d single" + "-m raid0 -d raid0" + "-m raid1 -d raid0" + "-m raid1 -d raid1" + "-m raid10 -d raid10" + "-m raid5 -d raid5" + "-m raid6 -d raid6" +) + +run_test() +{ + local mkfs_opts=$1 + local with_compress=$2 + + echo "Test $mkfs_opts with $with_compress" >>$seqres.full + + # dup only works on single device + if [[ "$mkfs_opts" =~ dup ]]; then + _scratch_mkfs $mkfs_opts >>$seqres.full 2>&1 + else + _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1 + fi + # 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 defrag worker: " >>$seqres.full + _btrfs_stress_defrag $SCRATCH_MNT $with_compress >/dev/null 2>&1 & + defrag_pid=$! + echo "$defrag_pid" >>$seqres.full + + echo "Wait for fsstress to exit and kill all background workers" >>$seqres.full + wait $fsstress_pid + kill $balance_pid $defrag_pid + wait + # wait for the balance and defrag operations to finish + while ps aux | grep "balance start" | grep -qv grep; do + sleep 1 + done + while ps aux | grep "btrfs filesystem defrag" | 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 + + $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT >/dev/null 2>&1 + _scratch_unmount + _check_scratch_fs +} + +echo "Silence is golden" +for t in "${tcs[@]}"; do + run_test "$t" nocompress + run_test "$t" compress +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 1c60c8f..85d30b3 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -63,3 +63,4 @@ 058 auto quick 059 auto balance subvol 060 auto balance scrub +061 auto balance defrag compress