From patchwork Thu Mar 19 20:31:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 6052111 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EC18A9F2A9 for ; Thu, 19 Mar 2015 20:31:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9AD520528 for ; Thu, 19 Mar 2015 20:31:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E965C2051D for ; Thu, 19 Mar 2015 20:31:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751265AbbCSUb1 (ORCPT ); Thu, 19 Mar 2015 16:31:27 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:63202 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751129AbbCSUbY (ORCPT ); Thu, 19 Mar 2015 16:31:24 -0400 Received: from pps.filterd (m0004060 [127.0.0.1]) by mx0b-00082601.pphosted.com (8.14.5/8.14.5) with SMTP id t2JKUfIx015993; Thu, 19 Mar 2015 13:31:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=lDju4iiomdQMLZmL0ifnAZk5fMgNX/L0ghJSQA4c28s=; b=qSYQGkqoez0b34PNdXiFDAcpw3ZIZPJgavolSDGpC5uDhTbpZOI8eLwnicDBiqwTrwfa 0HlHJAZFOoJilJpARFcJtbn6mORheskAPdUMdSmoSja7EL4xVg9Y2e2r4/42EY89Y6Ih Jt39qDDpL9OrdYB6Hd3ONPJcie3CbY4jQcQ= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0b-00082601.pphosted.com with ESMTP id 1t84rb06rn-1 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Thu, 19 Mar 2015 13:31:21 -0700 Received: from localhost (192.168.54.13) by mail.thefacebook.com (192.168.16.15) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 19 Mar 2015 13:31:19 -0700 From: Josef Bacik To: , , , , Subject: [PATCH 3/3] fstests: btrfs balance with dm log writes test Date: Thu, 19 Mar 2015 16:31:10 -0400 Message-ID: <1426797070-27463-4-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1426797070-27463-1-git-send-email-jbacik@fb.com> References: <1426797070-27463-1-git-send-email-jbacik@fb.com> MIME-Version: 1.0 X-Originating-IP: [192.168.54.13] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68, 1.0.33, 0.0.0000 definitions=2015-03-19_06:2015-03-19, 2015-03-19, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 kscore.is_bulkscore=5.92859095149834e-12 kscore.compositescore=0 circleOfTrustscore=0 compositescore=0.996032594475432 suspectscore=0 recipient_domain_to_sender_totalscore=0 phishscore=0 bulkscore=0 kscore.is_spamscore=0 rbsscore=0.996032594475432 recipient_to_sender_totalscore=0 recipient_domain_to_sender_domain_totalscore=0 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.996032594475432 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1503190188 X-FB-Internal: deliver 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 This test runs fsstress+balance+defrag and then replays every FUA in the log and mounts, scrubs and then fscks the fs to make sure it does the balance recovery properly. Thanks, Signed-off-by: Josef Bacik --- tests/btrfs/083 | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/083.out | 1 + tests/btrfs/group | 1 + 3 files changed, 137 insertions(+) create mode 100644 tests/btrfs/083 create mode 100644 tests/btrfs/083.out diff --git a/tests/btrfs/083 b/tests/btrfs/083 new file mode 100644 index 0000000..66118b9 --- /dev/null +++ b/tests/btrfs/083 @@ -0,0 +1,135 @@ +#! /bin/bash +# FSQA Test No. btrfs/083 +# +# Run btrfs balance and defrag operations simultaneously with fsstress +# running in background on top of dm-log-writes. +# +#----------------------------------------------------------------------- +# Copyright (C) 2015 Facebook. 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 +. ./common/dmlogwrites + +# real QA test starts here +_supported_fs btrfs +_supported_os Linux +# we check scratch dev after each loop +_need_to_be_root +_require_scratch_nocheck +_require_dm_log_writes + +rm -f $seqres.full + +_wait_balance() +{ + while [ 1 ] + do + $BTRFS_UTIL_PROG filesystem balance status $SCRATCH_MNT \ + | grep "No balance" >> $seqres.full + [ $? -eq 0 ] && break + sleep 1 + done +} + +run_test() +{ + 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 +} + +_init_log_writes + +_log_writes_mkfs >> $seqres.full 2>&1 + +_mount_log_writes + +run_test "$t" nocompress + +_unmount_log_writes +_log_writes_remove + +# Get the number of entries in the log +NUM_ENTRIES=$($REPLAYLOG_PROG --log $LOGWRITES_DEV --num-entries) + +# Start at the first FUA after the mkfs +ENTRY=$($REPLAYLOG_PROG --log $LOGWRITES_DEV --start-mark mkfs \ + --find --next-fua) + +while [ $ENTRY -lt $NUM_ENTRIES ]; +do + echo "Replaying to $ENTRY" >> $seqres.full + $REPLAYLOG_PROG --log $LOGWRITES_DEV --replay $SCRATCH_DEV --limit \ + $ENTRY > /dev/null 2>&1 + [ $? -ne 0 ] && _fatal "replay failed" + btrfsck $SCRATCH_DEV >> $seqres.full 2>&1 || _fatal "btrfsck failed" + _scratch_mount || _fatal "mount failed" + _wait_balance + $BTRFS_UTIL_PROG scrub start -B $SCRATCH_MNT >> $seqres.full 2>&1 + [ $? -ne 0 ] && _fatal "scrub failed" + _scratch_unmount + btrfsck $SCRATCH_DEV >> $seqres.full 2>&1 || _fatal "btrfsck failed" + let ENTRY+=1 + ENTRY=$($REPLAYLOG_PROG --find --start-entry $ENTRY --log \ + $LOGWRITES_DEV --next-fua) +done + +status=0 +exit + diff --git a/tests/btrfs/083.out b/tests/btrfs/083.out new file mode 100644 index 0000000..b675a31 --- /dev/null +++ b/tests/btrfs/083.out @@ -0,0 +1 @@ +QA output created by 083 diff --git a/tests/btrfs/group b/tests/btrfs/group index fd2fa76..88719ca 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -85,3 +85,4 @@ 080 auto snapshot 081 auto quick clone 082 auto quick remount +083 auto log