From patchwork Wed Nov 9 16:44:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 13037733 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 47442C433FE for ; Wed, 9 Nov 2022 16:45:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230220AbiKIQpP (ORCPT ); Wed, 9 Nov 2022 11:45:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230041AbiKIQpO (ORCPT ); Wed, 9 Nov 2022 11:45:14 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10EC02252B; Wed, 9 Nov 2022 08:45:10 -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 sin.source.kernel.org (Postfix) with ESMTPS id 4680DCE1FEA; Wed, 9 Nov 2022 16:45:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CD3AC433C1; Wed, 9 Nov 2022 16:45:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668012307; bh=j1Aieg493NQTqXY3czipEQEPMuHZTJs8oAvLJMoCCmw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YUZGFldR7KY1RuaX4oMDyVKCbpdNshSZRmLHHAnCsnlIfQIxC9cFc6FdbGo8rimLR 3XIfCVSVQBRpKdzif/JerQ5uR1HWj5SZGnOOQEeMGN0mq3oCflxJH+NgnT1mOWmzql 2kSCsxYnRIgqPSQ74Fg/OzMDf6+H83ltWGXjeZOqlDqVUlgJ5SY8t0xCs/pgTNSV1G Ztdkn1Ty1H+4ECZ8uZ/rkWryIvIGbqb8tCuH/7liuW44nCwsQaSNNkiCWJZPPKm03d JxUnTi0NNLIKe3Uy2EkDvzdt6hWztR1VIbmj3kJ8/s7lFjGbfDcTYgbUDB6Tq/NSVu N/jSBTc/xCWbg== From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe Manana Subject: [PATCH v2 3/3] btrfs: fix failure of tests that use defrag on btrfs-progs v6.0+ Date: Wed, 9 Nov 2022 16:44:58 +0000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Filipe Manana Starting with btrfs-progs v6.0, the defrag command now prints to stdout the full path of the files it processes. This makes test cases btrfs/021 and btrfs/256 fail because they don't expect any output from the defrag command. The change happened with the following commit in btrfs-progs: dd724f21803d ("btrfs-progs: add logic to handle LOG_DEFAULT messages") So update the tests to ignore the stdout of the defrag command. Signed-off-by: Filipe Manana Reviewed-by: Qu Wenruo --- tests/btrfs/021 | 4 +++- tests/btrfs/256 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/btrfs/021 b/tests/btrfs/021 index 5943da2f..1b55834a 100755 --- a/tests/btrfs/021 +++ b/tests/btrfs/021 @@ -22,8 +22,10 @@ run_test() sleep 0.5 + # In new versions of btrfs-progs (6.0+), the defrag command outputs to + # stdout the path of the files it operates on. So ignore that. find $SCRATCH_MNT -type f -print0 | xargs -0 \ - $BTRFS_UTIL_PROG filesystem defrag -f + $BTRFS_UTIL_PROG filesystem defrag -f > /dev/null sync wait diff --git a/tests/btrfs/256 b/tests/btrfs/256 index 1360c2c2..acbbc6fa 100755 --- a/tests/btrfs/256 +++ b/tests/btrfs/256 @@ -50,7 +50,9 @@ $FSSUM_PROG -A -f -w "$checksums_file" "$SCRATCH_MNT" # Now defrag each file. for sz in ${file_sizes[@]}; do echo "Defragging file with $sz bytes..." >> $seqres.full - $BTRFS_UTIL_PROG filesystem defragment "$SCRATCH_MNT/f_$sz" + # In new versions of btrfs-progs (6.0+), the defrag command outputs to + # stdout the path of the files it operates on. So ignore that. + $BTRFS_UTIL_PROG filesystem defragment "$SCRATCH_MNT/f_$sz" > /dev/null done # Verify the checksums after the defrag operations.