From patchwork Wed Sep 12 10:15:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 10597319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C420115E2 for ; Wed, 12 Sep 2018 10:15:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE91A29697 for ; Wed, 12 Sep 2018 10:15:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9FCBC29693; Wed, 12 Sep 2018 10:15:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F26829693 for ; Wed, 12 Sep 2018 10:15:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726670AbeILPTq (ORCPT ); Wed, 12 Sep 2018 11:19:46 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34052 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726552AbeILPTq (ORCPT ); Wed, 12 Sep 2018 11:19:46 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C5A3E804BCF4 for ; Wed, 12 Sep 2018 10:15:54 +0000 (UTC) Received: from dhcp-12-136.nay.redhat.com (unknown [10.66.12.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC10010EE6D7 for ; Wed, 12 Sep 2018 10:15:53 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH] shared/010: avoid dedupe testing blocked on large fs Date: Wed, 12 Sep 2018 18:15:47 +0800 Message-Id: <20180912101547.28835-1-zlang@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 12 Sep 2018 10:15:54 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 12 Sep 2018 10:15:54 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'zlang@redhat.com' RCPT:'' Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When test on large fs (--large-fs), xfstests preallocates a large file in SCRATCH_MNT/ at first. Duperemove will take too long time to deal with that large file (many days on 500T XFS). So move working directory to a sub-dir underlying $SCRATCH_MNT/. Signed-off-by: Zorro Lang Reviewed-by: Eric Sandeen --- Hi, Besides fix this issue, this patch fix another issue passingly. I left a bad variable named "testdir" in this case. This patch can fix it. If maintainer feels I should fix it in another patch, please tell me:-P Thanks, Zorro tests/shared/010 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/shared/010 b/tests/shared/010 index 1817081b..04f55890 100755 --- a/tests/shared/010 +++ b/tests/shared/010 @@ -65,15 +65,17 @@ function end_test() sleep_time=$((50 * TIME_FACTOR)) # Start fsstress +testdir="$SCRATCH_MNT/dir" +mkdir $testdir fsstress_opts="-r -n 1000 -p $((5 * LOAD_FACTOR))" -$FSSTRESS_PROG $fsstress_opts -d $SCRATCH_MNT -l 0 >> $seqres.full 2>&1 & +$FSSTRESS_PROG $fsstress_opts -d $testdir -l 0 >> $seqres.full 2>&1 & dedup_pids="" dupe_run=$TEST_DIR/${seq}-running # Start several dedupe processes on same directory touch $dupe_run for ((i = 0; i < $((2 * LOAD_FACTOR)); i++)); do while [ -e $dupe_run ]; do - $DUPEREMOVE_PROG -dr --dedupe-options=same $SCRATCH_MNT/ \ + $DUPEREMOVE_PROG -dr --dedupe-options=same $testdir \ >>$seqres.full 2>&1 done & dedup_pids="$! $dedup_pids"