Message ID | 173870406503.546134.2486707064611332584.stgit@frogsfrogsfrogs (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | [01/34] generic/476: fix fsstress process management | expand |
On Tue, Feb 04, 2025 at 01:29:05PM -0800, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > Always abort the non-remount scrub fsstress loop in > __stress_scrub_fsstress_loop if fsstress returns a nonzero exit code. > > Cc: <fstests@vger.kernel.org> # v2023.01.15 > Fixes: 20df87599f66d0 ("fuzzy: make scrub stress loop control more robust") > Signed-off-by: "Darrick J. Wong" <djwong@kernel.org> > --- > common/fuzzy | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Looks fine. Reviewed-by: Dave Chinner <dchinner@redhat.com>
diff --git a/common/fuzzy b/common/fuzzy index 41547add83121a..8afa4d35759f62 100644 --- a/common/fuzzy +++ b/common/fuzzy @@ -1012,6 +1012,7 @@ __stress_scrub_fsstress_loop() { local remount_period="$3" local stress_tgt="$4" local focus=() + local res case "$stress_tgt" in "parent") @@ -1143,7 +1144,9 @@ __stress_scrub_fsstress_loop() { # Need to recheck running conditions if we cleared anything __stress_scrub_clean_scratch && continue _run_fsstress $args >> $seqres.full - echo "fsstress exits with $? at $(date)" >> $seqres.full + res=$? + echo "$mode fsstress exits with $res at $(date)" >> $seqres.full + [ "$res" -ne 0 ] && break; done rm -f "$runningfile" }