From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B380C6379F for ; Tue, 14 Feb 2023 18:18:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232458AbjBNSSX (ORCPT ); Tue, 14 Feb 2023 13:18:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231845AbjBNSSW (ORCPT ); Tue, 14 Feb 2023 13:18:22 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DBAF252B7; Tue, 14 Feb 2023 10:18:21 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 39898617E2; Tue, 14 Feb 2023 18:18:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9586BC433EF; Tue, 14 Feb 2023 18:18:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676398700; bh=dLgxrWC2HtfAH4idGlLXbcOHJqbEqig4BIq9X4s9uaI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Bey9NEbAGdaoDBDjGAbQFQ4pd1JcWduVqePmn84kvnSM1c9XIzLweoJRpMwWg5d2a 8BrKa6cOtiJU9OgH5RrI0FXHHQd2Zr0K3tFWl/XzFxHm6Zbk28Z957NPDKqSKtCuUP FJOTgeJleif6KWPldAOt7aqVbnMMdJ/sIwXCl2U6W7nFpVIiIZYHwVYzfb3u1f3IxW nv4WkvCAYtN5mUebqlYQvbmhChsVp/fNNKcQhC8CYEQCic3jJqxmoHYyAZwi0KRV2S jMJx/KsPgn3TAxUjtZl0OYBO9l+wcGZ05XrMN2vBn18/m/ctOi4eNN6oIrPhu1qeiz 8iSrMTt2nScjg== Date: Tue, 14 Feb 2023 10:18:20 -0800 From: "Darrick J. Wong" To: Zorro Lang Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: Re: [PATCH 1/1] fuzzy: use FORCE_REBUILD over injecting force_repair Message-ID: References: <167243874952.722591.1496636246267309523.stgit@magnolia> <167243874964.722591.9199494099572054329.stgit@magnolia> <20230214080007.i7m5hzlcmthd6ka3@zlang-mailbox> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230214080007.i7m5hzlcmthd6ka3@zlang-mailbox> Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Tue, Feb 14, 2023 at 04:00:07PM +0800, Zorro Lang wrote: > On Fri, Dec 30, 2022 at 02:19:09PM -0800, Darrick J. Wong wrote: > > From: Darrick J. Wong > > > > For stress testing online repair, try to use the FORCE_REBUILD ioctl > > flag over the error injection knobs whenever possible because the knobs > > are very noisy and are not always available. > > > > Signed-off-by: Darrick J. Wong > > --- > > common/fuzzy | 34 +++++++++++++++++++++++++++++++--- > > 1 file changed, 31 insertions(+), 3 deletions(-) > > > > > > diff --git a/common/fuzzy b/common/fuzzy > > index f7f660bc31..14f7fdf03c 100644 > > --- a/common/fuzzy > > +++ b/common/fuzzy > > @@ -398,6 +398,9 @@ __stress_one_scrub_loop() { > > > > local xfs_io_args=() > > for arg in "$@"; do > > + if [ -n "$SCRUBSTRESS_USE_FORCE_REBUILD" ]; then > > + arg="$(echo "$arg" | sed -e 's/^repair/repair -R/g')" > > + fi > > if echo "$arg" | grep -q -w '%agno%'; then > > # Substitute the AG number > > for ((agno = 0; agno < agcount; agno++)); do > > @@ -695,13 +698,21 @@ _require_xfs_stress_scrub() { > > _notrun 'xfs scrub stress test requires common/filter' > > } > > > > +# Make sure that we can force repairs either by error injection or passing > > +# FORCE_REBUILD via ioctl. > > +__require_xfs_stress_force_rebuild() { > > + local output="$($XFS_IO_PROG -x -c 'repair -R probe' $SCRATCH_MNT 2>&1)" > > + test -z "$output" && return > > + _require_xfs_io_error_injection "force_repair" > > +} > > + > > # Make sure we have everything we need to run stress and online repair > > _require_xfs_stress_online_repair() { > > _require_xfs_stress_scrub > > _require_xfs_io_command "repair" > > command -v _require_xfs_io_error_injection &>/dev/null || \ > > _notrun 'xfs repair stress test requires common/inject' > > - _require_xfs_io_error_injection "force_repair" > > + __require_xfs_stress_force_rebuild > > _require_freeze > > } > > > > @@ -783,7 +794,11 @@ __stress_scrub_check_commands() { > > esac > > > > for arg in "$@"; do > > - local cooked_arg="$(echo "$arg" | sed -e "s/%agno%/0/g")" > > + local cooked_arg="$arg" > > + if [ -n "$SCRUBSTRESS_USE_FORCE_REBUILD" ]; then > > + cooked_arg="$(echo "$cooked_arg" | sed -e 's/^repair/repair -R/g')" > > + fi > > + cooked_arg="$(echo "$cooked_arg" | sed -e "s/%agno%/0/g")" > > testio=`$XFS_IO_PROG -x -c "$cooked_arg" "$cooked_tgt" 2>&1` > > echo $testio | grep -q "Unknown type" && \ > > _notrun "xfs_io scrub subcommand support is missing" > > @@ -943,10 +958,23 @@ _scratch_xfs_stress_scrub() { > > echo "Loop finished at $(date)" >> $seqres.full > > } > > > > +# Decide if we're going to force repairs either by error injection or passing > > +# FORCE_REBUILD via ioctl. > > +__scratch_xfs_stress_setup_force_rebuild() { > > + local output="$($XFS_IO_PROG -x -c 'repair -R probe' $SCRATCH_MNT 2>&1)" > > + > > + if [ -z "$output" ]; then > > + export SCRUBSTRESS_USE_FORCE_REBUILD=1 > > Do you need to use this parameter ^^ in another child process? Is the "export" > necessary? Nope, it's not required. --D > Thanks, > Zorro > > > + return > > + fi > > + > > + $XFS_IO_PROG -x -c 'inject force_repair' $SCRATCH_MNT > > +} > > + > > # Start online repair, freeze, and fsstress in background looping processes, > > # and wait for 30*TIME_FACTOR seconds to see if the filesystem goes down. > > # Same requirements and arguments as _scratch_xfs_stress_scrub. > > _scratch_xfs_stress_online_repair() { > > - $XFS_IO_PROG -x -c 'inject force_repair' $SCRATCH_MNT > > + __scratch_xfs_stress_setup_force_rebuild > > XFS_SCRUB_FORCE_REPAIR=1 _scratch_xfs_stress_scrub "$@" > > } > > >