From patchwork Fri Feb 7 14:00:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 3605331 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 635F9BF418 for ; Fri, 7 Feb 2014 14:03:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 721F520120 for ; Fri, 7 Feb 2014 14:03:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B37720117 for ; Fri, 7 Feb 2014 14:03:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752789AbaBGODE (ORCPT ); Fri, 7 Feb 2014 09:03:04 -0500 Received: from mail-pd0-f173.google.com ([209.85.192.173]:54796 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752772AbaBGODC (ORCPT ); Fri, 7 Feb 2014 09:03:02 -0500 Received: by mail-pd0-f173.google.com with SMTP id y10so3175783pdj.4 for ; Fri, 07 Feb 2014 06:03:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=j2CVZ+y/l3ykb9cjSREoU3duOXP7NUg1mEGsWqSJD+M=; b=xtwcA520iH4HxjQQ0otiCopTCQ03QbmiAcTssBW9yAeUybJvQE/jtFyPTBglqj1TVm cRhkq8XHuK28XuBW0+i07YfcQfqUGwO75hjnN/fYHlNgoZYsmTPorKfTPptOIZYDOEFF 76OzYFezXbMntE2P0W5tAHkl/A5N8OOaQEOi10Q+jbxZxUjdEDkyTmL0BxoLVdVHNZd1 y1QLYAVetCM5yg6bVxwCDhmaN6I/mCgyYdt9r1pgARmpuhnW0D5ADR0hwbs8ycBsyb/j s84zJEE86Ag4241hs6toZYRJ+/aobe4Yn+ol9qo3ADDibtPCfBHXo3aHKWjybFBPvBOU BrRQ== X-Received: by 10.66.138.40 with SMTP id qn8mr8085953pab.154.1391781782386; Fri, 07 Feb 2014 06:03:02 -0800 (PST) Received: from linux-b0ol.site ([223.65.143.99]) by mx.google.com with ESMTPSA id xs1sm34267730pac.7.2014.02.07.06.02.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Feb 2014 06:03:01 -0800 (PST) From: Wang Shilong To: xfs@oss.sgi.com Cc: linux-btrfs@vger.kernel.org, david@fromorbit.com Subject: [PATCH v4] xfstests/btrfs: add a regression test for running snapshot and send concurrently Date: Fri, 7 Feb 2014 22:00:56 +0800 Message-Id: <1391781656-9469-1-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.8.4 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Wang Shilong Btrfs would fail to send if snapshot run concurrently, this test is to make sure we have fixed the bug. Signed-off-by: Wang Shilong Reviewed-by: Josef Bacik --- v3->v4: avoid to use silent send command(thanks to Dave Chinner) rename patch's subject from Btrfs to xfstest/btrfs(thanks to Anand) make sure background snapshots exists before killing it. v2->v3: make sure we kill backgrund snapshots on test failure. v1-v2: Avoid race codes and a code style update(Thanks to Dave Chinner's comments) --- tests/btrfs/034 | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/034.out | 2 ++ tests/btrfs/group | 1 + 3 files changed, 88 insertions(+) create mode 100644 tests/btrfs/034 create mode 100644 tests/btrfs/034.out diff --git a/tests/btrfs/034 b/tests/btrfs/034 new file mode 100644 index 0000000..06c796e --- /dev/null +++ b/tests/btrfs/034 @@ -0,0 +1,85 @@ +#!/bin/bash +# FS QA Test No. btrfs/034 +# +# Regression test for running snapshots and send concurrently. +# +#----------------------------------------------------------------------- +# Copyright (c) 2014 Fujitsu. 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 # failure is the default! +snapshots_pid=0 + +_cleanup() +{ + # kill backgroud snapshots + if [ $snapshots_pid -ne 0 ] && ps -p $snapshots_pid | grep -q $snapshots_pid; then + kill -TERM $snapshots_pid 2> /dev/null + fi + rm -f $tmp.* +} + +do_snapshots() +{ + i=2 + while [ 1 ] + do + $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT/snap_1 \ + $SCRATCH_MNT/snap_$i >> $seqres.full 2>&1 + let i=$i+1 + sleep 1 + done +} + +trap "_cleanup ; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs btrfs +_supported_os Linux +_require_scratch + +_scratch_mkfs > /dev/null 2>&1 +_scratch_mount + +touch $SCRATCH_MNT/foo + +# get file with fragments by using backwards writes. +for i in `seq 10240 -1 1`; do + $XFS_IO_PROG -f -d -c "pwrite $(($i * 4096)) 4096" \ + $SCRATCH_MNT/foo > /dev/null | _filter_xfs_io +done + +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \ + $SCRATCH_MNT/snap_1 >> $seqres.full 2>&1 + +do_snapshots & +snapshots_pid=$! + +$BTRFS_UTIL_PROG send $SCRATCH_MNT/snap_1 -f /dev/null 2>&1 | _filter_scratch + +status=0 ; exit diff --git a/tests/btrfs/034.out b/tests/btrfs/034.out new file mode 100644 index 0000000..9ed31e8 --- /dev/null +++ b/tests/btrfs/034.out @@ -0,0 +1,2 @@ +QA output created by 034 +At subvol SCRATCH_MNT/snap_1 diff --git a/tests/btrfs/group b/tests/btrfs/group index b29236c..f9f062f 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -36,3 +36,4 @@ 031 auto quick 032 auto quick 033 auto quick +034 auto quick