From patchwork Wed Jun 21 07:50:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 9801001 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 823F260234 for ; Wed, 21 Jun 2017 07:50:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F39628546 for ; Wed, 21 Jun 2017 07:50:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 635862855D; Wed, 21 Jun 2017 07:50:59 +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=-6.9 required=2.0 tests=BAYES_00,LOTS_OF_MONEY, 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 8BAE428546 for ; Wed, 21 Jun 2017 07:50:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752247AbdFUHun (ORCPT ); Wed, 21 Jun 2017 03:50:43 -0400 Received: from mx2.suse.de ([195.135.220.15]:40201 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752218AbdFUHun (ORCPT ); Wed, 21 Jun 2017 03:50:43 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 38DB6ABBD; Wed, 21 Jun 2017 07:50:41 +0000 (UTC) From: Nikolay Borisov To: eguan@redhat.com Cc: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org, dsterba@suse.com, Nikolay Borisov Subject: [PATCH v2] btrfs/146: Test various btrfs operations rounding behavior Date: Wed, 21 Jun 2017 10:50:35 +0300 Message-Id: <1498031435-28344-1-git-send-email-nborisov@suse.com> X-Mailer: git-send-email 2.7.4 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When changing the size of disks/filesystem we should always be rounding down to a multiple of sectorsize Signed-off-by: Nikolay Borisov --- Changes since v1: - Worked on incorporated feedback by Eryu - Changed test number to 146 to avoid clashes tests/btrfs/146 | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/146.out | 20 +++++++ tests/btrfs/group | 1 + 3 files changed, 168 insertions(+) create mode 100755 tests/btrfs/146 create mode 100644 tests/btrfs/146.out diff --git a/tests/btrfs/146 b/tests/btrfs/146 new file mode 100755 index 0000000..7e6d40f --- /dev/null +++ b/tests/btrfs/146 @@ -0,0 +1,147 @@ +#! /bin/bash +# FS QA Test No. btrfs/146 +# +# Test that various code paths which deal with modifying the total size +# of devices/superblock correctly round the value to a multiple of +# sector size +# +#----------------------------------------------------------------------- +# +# Copyright (C) 2017 SUSE Linux Products GmbH. All Rights Reserved. +# Author: Nikolay Borisov +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + $UMOUNT_PROG $loop_mnt + _destroy_loop_device $loop_dev1 + _destroy_loop_device $loop_dev2 + cd / + rm -f $tmp.* + +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs btrfs +_supported_os Linux +_require_scratch +_require_loop +_require_block_device $SCRATCH_DEV +_require_btrfs_command inspect-internal dump-super +# ~2.1 gigabytes just to be on the safe side +_require_fs_space $SCRATCH_MNT $(( 2202009 )) + +rm -f $seqres.full + +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount + + +# Size of devices which are going to be half a page larger than +# default sectorsize (4kb) +expectedsize=$(( 1 * 1024 * 1024 * 1024 )) +filesize=$(( $expectedsize + 2048 )) +loop_mnt=$SCRATCH_MNT/mount +fs_img1=$SCRATCH_MNT/disk1.img +fs_img2=$SCRATCH_MNT/disk2.img + +mkdir $loop_mnt + +#create files to hold dummy devices +$XFS_IO_PROG -f -c "falloc 0 $filesize" $fs_img1 &> /dev/null +$XFS_IO_PROG -f -c "falloc 0 $filesize" $fs_img2 &> /dev/null + +loop_dev1=$(_create_loop_device $fs_img1) +loop_dev2=$(_create_loop_device $fs_img2) + +#create fs only on the first device +_mkfs_dev $loop_dev1 +_mount $loop_dev1 $loop_mnt + +echo "Size from mkfs" +$BTRFS_UTIL_PROG inspect-internal dump-super /dev/loop0 | grep total + +#resize down to 768mb + 2k +$BTRFS_UTIL_PROG filesystem resize 824182784 $loop_mnt >>$seqres.full 2>&1 +sync + +echo "" + +echo "Size after resizing down" +$BTRFS_UTIL_PROG inspect-internal dump-super $loop_dev1 | grep total + +echo "" + +#now resize back up to 1 gb +$BTRFS_UTIL_PROG filesystem resize max $loop_mnt >>$seqres.full 2>&1 +sync + +echo "Size after resizing up" +$BTRFS_UTIL_PROG inspect-internal dump-super /dev/loop0 | grep total + +# Add fs load for later balance operations, we need to do this +# before adding a second device +$FSSTRESS_PROG -w -n 15000 -p 2 -d $loop_mnt >> $seqres.full 2>&1 + +# add second unaligned device, this checks the btrfs_init_new_device codepath +# device should be aligned +$BTRFS_UTIL_PROG device add $loop_dev2 $loop_mnt >>$seqres.full 2>&1 +sync + +echo "" + +# Ensure that adding a device doesn't cause the superbock to be +# unaligned +echo "Size of superblock after device addition" +$BTRFS_UTIL_PROG inspect-internal dump-super $loop_dev1 | grep total + +echo "" + +# The newly added device must also be aligned +echo "Size of superblock/device for second device" +$BTRFS_UTIL_PROG inspect-internal dump-super $loop_dev2 | grep total + +# now start a balance, this might produce warnings while +# it's relocating chunks and updating the size of devices +$BTRFS_UTIL_PROG balance start $loop_mnt >> $seqres.full 2>&1 +sync + +# delete everything and then run balance +rm -rf $loop_mnt/* + +# do a bit more stress testing until we fill the fs +$FSSTRESS_PROG -w -n 15000 -p 4 -d $loop_mnt >> $seqres.full 2>&1 +rm -rf $loop_mnt/p0 $loop_mnt/p2 + +# run balance again, this time we will be freeing chunks +$BTRFS_UTIL_PROG balance start $loop_mnt >> $seqres.full 2>&1 +sync + +status=$? +exit diff --git a/tests/btrfs/146.out b/tests/btrfs/146.out new file mode 100644 index 0000000..8fb671b --- /dev/null +++ b/tests/btrfs/146.out @@ -0,0 +1,20 @@ +QA output created by 146 +Size from mkfs +total_bytes 1073741824 +dev_item.total_bytes 1073741824 + +Size after resizing down +total_bytes 824180736 +dev_item.total_bytes 824180736 + +Size after resizing up +total_bytes 1073741824 +dev_item.total_bytes 1073741824 + +Size of superblock after device addition +total_bytes 2147483648 +dev_item.total_bytes 1073741824 + +Size of superblock/device for second device +total_bytes 2147483648 +dev_item.total_bytes 1073741824 diff --git a/tests/btrfs/group b/tests/btrfs/group index 629919b..f74f50c 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -148,3 +148,4 @@ 143 auto quick 144 auto quick send 145 auto quick send +146 auto quick