From patchwork Tue Oct 1 09:04:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 11168301 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B75811902 for ; Tue, 1 Oct 2019 09:04:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A0EE921906 for ; Tue, 1 Oct 2019 09:04:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733123AbfJAJEY (ORCPT ); Tue, 1 Oct 2019 05:04:24 -0400 Received: from mx2.suse.de ([195.135.220.15]:49548 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729642AbfJAJEX (ORCPT ); Tue, 1 Oct 2019 05:04:23 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 4C68CAC31; Tue, 1 Oct 2019 09:04:22 +0000 (UTC) From: Nikolay Borisov To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov Subject: [PATCH v2 1/2] common/rc: Remove special handing of 'dup' argument for btrfs Date: Tue, 1 Oct 2019 12:04:18 +0300 Message-Id: <20191001090419.22153-1-nborisov@suse.com> X-Mailer: git-send-email 2.17.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org _scratch_pool_mkfs special cases the command executed when 'dup' option is used when creating a filesystem. This is wrong since 'dup' works for all profiles and number of devices. This bug manifested while exercising btrfs' balance argument combinations test. Signed-off-by: Nikolay Borisov --- V2: * No change since v1 common/rc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/common/rc b/common/rc index 9f2c252e5aa5..1b150cbad2f6 100644 --- a/common/rc +++ b/common/rc @@ -885,13 +885,7 @@ _scratch_pool_mkfs() { case $FSTYP in btrfs) - # if dup profile is in mkfs options call _scratch_mkfs instead - # because dup profile only works with single device - if [[ "$*" =~ dup ]]; then - _scratch_mkfs $* - else - $MKFS_BTRFS_PROG $MKFS_OPTIONS $* $SCRATCH_DEV_POOL > /dev/null - fi + $MKFS_BTRFS_PROG $MKFS_OPTIONS $* $SCRATCH_DEV_POOL > /dev/null ;; *) echo "_scratch_pool_mkfs is not implemented for $FSTYP" 1>&2 From patchwork Tue Oct 1 09:04:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 11168305 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5A9C3199D for ; Tue, 1 Oct 2019 09:04:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 436B021920 for ; Tue, 1 Oct 2019 09:04:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733223AbfJAJEY (ORCPT ); Tue, 1 Oct 2019 05:04:24 -0400 Received: from mx2.suse.de ([195.135.220.15]:49554 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727957AbfJAJEY (ORCPT ); Tue, 1 Oct 2019 05:04:24 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id BAD0EAD69; Tue, 1 Oct 2019 09:04:22 +0000 (UTC) From: Nikolay Borisov To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov Subject: [PATCH v2 2/2] btrfs: Add test for btrfs balance convert functionality Date: Tue, 1 Oct 2019 12:04:19 +0300 Message-Id: <20191001090419.22153-2-nborisov@suse.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191001090419.22153-1-nborisov@suse.com> References: <20191001090419.22153-1-nborisov@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Add basic test to ensure btrfs conversion functionality is tested. This test exercies conversion to all possible types of the data portion. This is sufficient since from the POV of relocation we are only moving blockgroups. Signed-off-by: Nikolay Borisov Reviewed-by: Qu Wenruo --- tests/btrfs/194 | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/194.out | 2 ++ tests/btrfs/group | 1 + 3 files changed, 87 insertions(+) create mode 100755 tests/btrfs/194 create mode 100644 tests/btrfs/194.out diff --git a/tests/btrfs/194 b/tests/btrfs/194 new file mode 100755 index 000000000000..39b6e0a969c1 --- /dev/null +++ b/tests/btrfs/194 @@ -0,0 +1,84 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2019 SUSE Linux Products GmbH. All Rights Reserved. +# +# FS QA Test 194 +# +# Test raid profile conversion. It's sufficient to test all dest profiles as +# source profiles just rely on being able to read the metadata. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs btrfs +_supported_os Linux +_require_scratch_dev_pool 4 + + +declare -a TEST_VECTORS=( +# $nr_dev_min:$data:$metadata:$data_convert:$metadata_convert +"4:single:raid1" +"4:single:raid0" +"4:single:raid10" +"4:single:dup" +"4:single:raid5" +"4:single:raid6" +"2:raid1:single" +) + +run_testcase() { + IFS=':' read -ra args <<< $1 + num_disks=${args[0]} + src_type=${args[1]} + dst_type=${args[2]} + + _scratch_dev_pool_get $num_disks + + echo "=== Running test: $1 ===" >> $seqres.full + + _scratch_pool_mkfs -d$src_type >> $seqres.full 2>&1 + _scratch_mount + + # Create random filesystem with 20k write ops + run_check $FSSTRESS_PROG -d $SCRATCH_MNT -w -n 10000 $FSSTRESS_AVOID + + $BTRFS_UTIL_PROG balance start -f -dconvert=$dst_type $SCRATCH_MNT >> $seqres.full 2>&1 + [ $? -eq 0 ] || echo "$1: Failed convert" + + $BTRFS_UTIL_PROG scrub start -B $SCRATCH_MNT >>$seqres.full 2>&1 + [ $? -eq 0 ] || echo "$1: Scrub failed" + + _scratch_unmount + _check_btrfs_filesystem $SCRATCH_DEV + _scratch_dev_pool_put +} + +for i in "${TEST_VECTORS[@]}"; do + run_testcase $i +done + +echo "Silence is golden" +status=0 +exit diff --git a/tests/btrfs/194.out b/tests/btrfs/194.out new file mode 100644 index 000000000000..7bfd50ffb5a4 --- /dev/null +++ b/tests/btrfs/194.out @@ -0,0 +1,2 @@ +QA output created by 194 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index b92cb12ca66f..a2c0ad87d0f6 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -196,3 +196,4 @@ 191 auto quick send dedupe 192 auto replay snapshot stress 193 auto quick qgroup enospc limit +194 auto volume balance