* [PATCH 1/3][RESEND] xfstests: fix 251's cp -axT problem @ 2012-02-06 8:27 ` Liu Bo 0 siblings, 0 replies; 14+ messages in thread From: Liu Bo @ 2012-02-06 8:27 UTC (permalink / raw) To: linux-btrfs; +Cc: xfs, hch When I ran xfstests, 251 got failed cause I use a symlink and "cp -axT" did not work as wish: cp: cannot overwrite directory `/mnt/scratch/1' with non-directory With this patch, 251 has passed. Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com> --- 251 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/251 b/251 index fa3d74a..b54e4c3 100755 --- a/251 +++ b/251 @@ -130,7 +130,7 @@ function run_process() { # Copy content -> partition. mkdir $SCRATCH_MNT/$p - cp -axT $content $SCRATCH_MNT/$p + cp -axT $content/ $SCRATCH_MNT/$p/ export chpid=$! && wait $chpid &> /dev/null check_sums -- 1.6.5.2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 1/3][RESEND] xfstests: fix 251's cp -axT problem @ 2012-02-06 8:27 ` Liu Bo 0 siblings, 0 replies; 14+ messages in thread From: Liu Bo @ 2012-02-06 8:27 UTC (permalink / raw) To: linux-btrfs; +Cc: hch, xfs When I ran xfstests, 251 got failed cause I use a symlink and "cp -axT" did not work as wish: cp: cannot overwrite directory `/mnt/scratch/1' with non-directory With this patch, 251 has passed. Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com> --- 251 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/251 b/251 index fa3d74a..b54e4c3 100755 --- a/251 +++ b/251 @@ -130,7 +130,7 @@ function run_process() { # Copy content -> partition. mkdir $SCRATCH_MNT/$p - cp -axT $content $SCRATCH_MNT/$p + cp -axT $content/ $SCRATCH_MNT/$p/ export chpid=$! && wait $chpid &> /dev/null check_sums -- 1.6.5.2 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/3][RESEND] xfstests: make 218 support btrfs 2012-02-06 8:27 ` Liu Bo @ 2012-02-06 8:27 ` Liu Bo -1 siblings, 0 replies; 14+ messages in thread From: Liu Bo @ 2012-02-06 8:27 UTC (permalink / raw) To: linux-btrfs; +Cc: xfs, hch Btrfs progs has a defragment tool, so we can test 218 on btrfs now. Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com> --- 218 | 2 +- common.defrag | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/218 b/218 index 53d0b61..77782c6 100755 --- a/218 +++ b/218 @@ -44,7 +44,7 @@ _cleanup() . ./common.defrag # real QA test starts here -_supported_fs xfs ext4 +_supported_fs xfs ext4 btrfs _supported_os Linux _setup_testdir diff --git a/common.defrag b/common.defrag index 4850803..ea6c14c 100644 --- a/common.defrag +++ b/common.defrag @@ -29,6 +29,9 @@ _require_defrag() ext4|ext4dev) DEFRAG_PROG=/usr/bin/e4defrag ;; + btrfs) + DEFRAG_PROG="$BTRFS_UTIL_PROG filesystem defragment" + ;; *) _notrun "defragmentation not supported for fstype \"$FSTYP\"" ;; -- 1.6.5.2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/3][RESEND] xfstests: make 218 support btrfs @ 2012-02-06 8:27 ` Liu Bo 0 siblings, 0 replies; 14+ messages in thread From: Liu Bo @ 2012-02-06 8:27 UTC (permalink / raw) To: linux-btrfs; +Cc: hch, xfs Btrfs progs has a defragment tool, so we can test 218 on btrfs now. Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com> --- 218 | 2 +- common.defrag | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/218 b/218 index 53d0b61..77782c6 100755 --- a/218 +++ b/218 @@ -44,7 +44,7 @@ _cleanup() . ./common.defrag # real QA test starts here -_supported_fs xfs ext4 +_supported_fs xfs ext4 btrfs _supported_os Linux _setup_testdir diff --git a/common.defrag b/common.defrag index 4850803..ea6c14c 100644 --- a/common.defrag +++ b/common.defrag @@ -29,6 +29,9 @@ _require_defrag() ext4|ext4dev) DEFRAG_PROG=/usr/bin/e4defrag ;; + btrfs) + DEFRAG_PROG="$BTRFS_UTIL_PROG filesystem defragment" + ;; *) _notrun "defragmentation not supported for fstype \"$FSTYP\"" ;; -- 1.6.5.2 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3][RESEND] 218: support btrfs 2012-02-06 8:27 ` Liu Bo @ 2012-03-31 20:12 ` Christoph Hellwig -1 siblings, 0 replies; 14+ messages in thread From: Christoph Hellwig @ 2012-03-31 20:12 UTC (permalink / raw) To: Liu Bo; +Cc: linux-btrfs, hch, xfs On Mon, Feb 06, 2012 at 04:27:48PM +0800, Liu Bo wrote: > Btrfs progs has a defragment tool, so we can test 218 on btrfs now. Thanks, applied. ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3][RESEND] 218: support btrfs @ 2012-03-31 20:12 ` Christoph Hellwig 0 siblings, 0 replies; 14+ messages in thread From: Christoph Hellwig @ 2012-03-31 20:12 UTC (permalink / raw) To: Liu Bo; +Cc: hch, linux-btrfs, xfs On Mon, Feb 06, 2012 at 04:27:48PM +0800, Liu Bo wrote: > Btrfs progs has a defragment tool, so we can test 218 on btrfs now. Thanks, applied. _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/3] xfstests: add btrfs online defragments QA test 2012-02-06 8:27 ` Liu Bo @ 2012-02-06 8:27 ` Liu Bo -1 siblings, 0 replies; 14+ messages in thread From: Liu Bo @ 2012-02-06 8:27 UTC (permalink / raw) To: linux-btrfs; +Cc: xfs, hch As the title shows, we port btrfs online defragments QA test into xfstests. Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com> --- 278 | 66 +++++++ 278.out | 125 ++++++++++++++ group | 1 + src/Makefile | 2 +- src/btrfs_online_defragment/Makefile | 17 ++ src/btrfs_online_defragment/args.in | 18 ++ src/btrfs_online_defragment/runtest.sh | 291 ++++++++++++++++++++++++++++++++ 7 files changed, 519 insertions(+), 1 deletions(-) create mode 100755 278 create mode 100644 278.out create mode 100644 src/btrfs_online_defragment/Makefile create mode 100644 src/btrfs_online_defragment/args.in create mode 100755 src/btrfs_online_defragment/runtest.sh diff --git a/278 b/278 new file mode 100755 index 0000000..be501cd --- /dev/null +++ b/278 @@ -0,0 +1,66 @@ +#! /bin/bash +# FS QA Test No. 278 +# +# Btrfs Online defragmentation tests +# +#----------------------------------------------------------------------- +# Copyright (c) 2012 Fujitsu Liu Bo. All Rights Reserved. +# +# 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 +#----------------------------------------------------------------------- +# +# creator +owner=liubo2009@cn.fujitsu.com + +seq=`basename $0` +echo "QA output created by $seq" +progs_dir="`pwd`/src/btrfs_online_defragment/" +tmp=tmp/$$ +defrag_args="$progs_dir/args.in" + +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +_runtest() +{ + $progs_dir/runtest.sh $defrag_args $SCRATCH_MNT $SCRATCH_DEV +} + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.defrag + +# real QA test starts here +_supported_fs xfs btrfs +_supported_os Linux + +_setup_testdir +## We require scratch so that we'll have free contiguous space +_require_scratch +_scratch_mkfs >/dev/null 2>&1 +_scratch_mount + +_require_defrag + +_runtest + +status=0 +exit diff --git a/278.out b/278.out new file mode 100644 index 0000000..f679df2 --- /dev/null +++ b/278.out @@ -0,0 +1,125 @@ +QA output created by 278 +btrfs online defragment test start +***1 1 1 1 1***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 1 1 1 1***END*** +***1 1 1 1 2***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: -1 +***1 1 1 1 2***END*** +***1 1 1 1 3***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: PAGESIZE +***1 1 1 1 3***END*** +***1 1 1 2 1***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: on +online defragment thresh: default(256K) +***1 1 1 2 1***END*** +***1 1 2 - -***START*** +a single file +online defragment range: default +online defragment compress: on +***1 1 2 - -***END*** +***1 6 1 1 1***START*** +a single file +online defragment range: start = 0 && 0 < len < file size +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 6 1 1 1***END*** +***1 1 1 1 1***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 1 1 1 1***END*** +***1 1 1 1 2***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: -1 +***1 1 1 1 2***END*** +***1 1 1 1 3***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: PAGESIZE +***1 1 1 1 3***END*** +***1 1 1 2 1***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: on +online defragment thresh: default(256K) +***1 1 1 2 1***END*** +***1 1 2 - -***START*** +a single file +online defragment range: default +online defragment compress: on +***1 1 2 - -***END*** +***1 2 1 1 1***START*** +a single file +online defragment range: start < 0 && 0 < len < file size +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 2 1 1 1***END*** +***1 3 1 1 1***START*** +a single file +online defragment range: start > file size && 0 < len < file size +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 3 1 1 1***END*** +***1 4 1 1 1***START*** +a single file +online defragment range: start = 0 && len < 0 +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 4 1 1 1***END*** +***1 5 1 1 1***START*** +a single file +online defragment range: start = 0 && len > file size +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 5 1 1 1***END*** +***1 6 1 1 1***START*** +a single file +online defragment range: start = 0 && 0 < len < file size +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 6 1 1 1***END*** +***2 1 1 1 1***START*** +a directory +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***2 1 1 1 1***END*** +***3 1 1 1 1***START*** +a filesystem +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***3 1 1 1 1***END*** +btrfs online defragment test done diff --git a/group b/group index 99592d3..9dedd25 100644 --- a/group +++ b/group @@ -391,3 +391,4 @@ deprecated 275 auto rw 276 auto rw metadata 277 auto ioctl quick metadata +278 auto diff --git a/src/Makefile b/src/Makefile index 67250ee..cba2f58 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,7 +19,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ bulkstat_unlink_test_modified t_dir_offset t_futimens t_immutable \ stale_handle pwrite_mmap_blocked fstrim t_dir_offset2 -SUBDIRS = +SUBDIRS = btrfs_online_defragment LLDLIBS = $(LIBATTR) $(LIBHANDLE) $(LIBACL) diff --git a/src/btrfs_online_defragment/Makefile b/src/btrfs_online_defragment/Makefile new file mode 100644 index 0000000..e05700e --- /dev/null +++ b/src/btrfs_online_defragment/Makefile @@ -0,0 +1,17 @@ +TOPDIR = ../.. +include $(TOPDIR)/include/builddefs + +SCRIPTS = runtest.sh + +default: depend $(SCRIPTS) + +depend: .dep + +include $(BUILDRULES) + + +install: + $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/src/btrfs_online_defragment + $(INSTALL) -m 755 $(SCRIPTS) $(PKG_LIB_DIR)/src/btrfs_online_defragment + +-include .dep diff --git a/src/btrfs_online_defragment/args.in b/src/btrfs_online_defragment/args.in new file mode 100644 index 0000000..9c22dc9 --- /dev/null +++ b/src/btrfs_online_defragment/args.in @@ -0,0 +1,18 @@ +1 1 1 1 1 +1 1 1 1 2 +1 1 1 1 3 +1 1 1 2 1 +1 1 2 - - +1 6 1 1 1 +1 1 1 1 1 +1 1 1 1 2 +1 1 1 1 3 +1 1 1 2 1 +1 1 2 - - +1 2 1 1 1 +1 3 1 1 1 +1 4 1 1 1 +1 5 1 1 1 +1 6 1 1 1 +2 1 1 1 1 +3 1 1 1 1 diff --git a/src/btrfs_online_defragment/runtest.sh b/src/btrfs_online_defragment/runtest.sh new file mode 100755 index 0000000..7c4e07f --- /dev/null +++ b/src/btrfs_online_defragment/runtest.sh @@ -0,0 +1,291 @@ +#!/bin/sh +################################################################################ +# # +# Copyright (c) 2010 FUJITSU LIMITED # +# # +# 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; either version 2 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will 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 to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# # +# Author: Liu Bo <liubo2009@cn.fujitsu.com> # +# # +# # +################################################################################ + +#**************************************************************************** +# DEV: mount device # +# MNT: mount point # +# ARGS: test case argument set # +#**************************************************************************** + +TPATH="`pwd`/src/btrfs_online_defragment" +PAGESIZE=4096 +FILESIZE=0 + +Mkbtrfs() +{ +#****************************** +# mkfs.btrfs +#****************************** + umount $MNT &>/dev/null + umount $DEV &>/dev/null + + mkfs.btrfs $DEV &> /dev/null + + if [ $? -ne 0 ];then + echo "***this case FAIL on mkfs.btrfs***" + continue + fi +} + +Mountfs() +{ + mount $DEV $MNT +} + +Createfile() +{ + CNT=11999 + FILESIZE=48000 + if [ "$DEFRAG_TARGET" = "1" ];then + for i in `seq $CNT -1 0`; do + dd if=/dev/zero of=$MNT/tmp_file bs=4k count=1 conv=notrunc seek=$i oflag=sync &>/dev/null + done + # get md5sum + md5sum $MNT/tmp_file > /tmp/checksum + elif [ "$DEFRAG_TARGET" = "2" ];then + mkdir $MNT/tmp_dir + for i in `seq $CNT -1 0`; do + dd if=/dev/zero of=$MNT/tmp_dir/tmp_file bs=4k count=1 conv=notrunc seek=$i oflag=sync &>/dev/null + done + # get md5sum + md5sum $MNT/tmp_dir/tmp_file > /tmp/checksum + elif [ "$DEFRAG_TARGET" = "3" ];then + for i in `seq $CNT -1 0`; do + dd if=/dev/zero of=$MNT/tmp_file bs=4k count=1 conv=notrunc seek=$i oflag=sync &>/dev/null + done + # get md5sum + md5sum $MNT/tmp_file > /tmp/checksum + fi +} + +Setup() +{ +#****************************** +# first---mkfs.btrfs +#****************************** + Mkbtrfs + +#****************************** +# second---mount +#****************************** + Mountfs + +#****************************** +# third---create file +#****************************** + Createfile + +} + +Cleanup() +{ + rm -fr $MNT/* + + umount $MNT + if [ $? -ne 0 ];then + echo "umount failed!" + fi +} + +Btrfs_online_defrag() +{ + str="" + if [ "$FILE_RANGE" = "2" ];then + str="$str -s -1 -l $((FILESIZE / 2)) " + elif [ "$FILE_RANGE" = "3" ];then + str="$str -s $((FILESIZE + 1)) -l $((FILESIZE / 2)) " + HAVE_DEFRAG=1 + elif [ "$FILE_RANGE" = "4" ];then + str="$str -l -1 " + elif [ "$FILE_RANGE" = "5" ];then + str="$str -l $((FILESIZE + 1)) " + elif [ "$FILE_RANGE" = "6" ];then + str="$str -l $((FILESIZE / 2)) " + fi + + if [ "$DEFRAG_COMPRESS" = "2" ];then + str="$str -c " + fi + + if [ "$FLUSH" = "2" ];then + str="$str -f " + fi + + if [ "$THRESH" = "2" ];then + str="$str -t -1 " + elif [ "$THRESH" = "3" ];then + str="$str -t $PAGESIZE " + fi + + if [ "$str" != "" ]; then + btrfs filesystem defragment $str $MNT/tmp_file + else + if [ "$DEFRAG_TARGET" = "1" ];then + btrfs filesystem defragment $MNT/tmp_file + elif [ "$DEFRAG_TARGET" = "2" ];then + btrfs filesystem defragment $MNT/tmp_dir + elif [ "$DEFRAG_TARGET" = "3" ];then + btrfs filesystem defragment $MNT + fi + fi + ret_val=$? + sync + if [ $ret_val -ne 20 ];then + echo "btrfs filesystem defragment failed! err is $ret_val" + fi +} + +Checksum() +{ + md5sum -c /tmp/checksum > /dev/null 2>&1 + if [ $? -ne 0 ];then + echo "md5 checksum failed!" + fi +} + +FSCK() +{ + btrfsck $DEV > /dev/null 2>&1 + ret_val=$? + if [ $ret_val -ne 0 ];then + echo "*****btrfsck _FAIL_! err is $ret_val*****" + fi +} + +Parse_options() +{ + PASS=0 + if [ "`echo $args | grep "#"`" != "" ];then + PASS=1 + fi + + if [ $PASS -ne 1 ];then + DEFRAG_TARGET=`echo $args | awk -F ' ' '{ print $1 }'` + case $DEFRAG_TARGET in + "1") + echo "a single file" + ;; + "2") + echo "a directory" + ;; + "3") + echo "a filesystem" + ;; + esac + + FILE_RANGE=`echo $args | awk -F ' ' '{ print $2 }'` + case $FILE_RANGE in + "1") + echo "online defragment range: default" + ;; + "2") + echo "online defragment range: start < 0 && 0 < len < file size" + ;; + "3") + echo "online defragment range: start > file size && 0 < len < file size" + ;; + "4") + echo "online defragment range: start = 0 && len < 0" + ;; + "5") + echo "online defragment range: start = 0 && len > file size" + ;; + "6") + echo "online defragment range: start = 0 && 0 < len < file size" + ;; + esac + + DEFRAG_COMPRESS=`echo $args | awk -F ' ' '{ print $3 }'` + case $DEFRAG_COMPRESS in + "1") + echo "online defragment compress: off" + ;; + "2") + echo "online defragment compress: on" + esac + + FLUSH=`echo $args | awk -F ' ' '{ print $4 }'` + case $FLUSH in + "1") + echo "online defragment flush: off" + ;; + "2") + echo "online defragment flush: on" + ;; + esac + + THRESH=`echo $args | awk -F ' ' '{ print $5 }'` + case $THRESH in + "1") + echo "online defragment thresh: default(256K)" + ;; + "2") + echo "online defragment thresh: -1" + ;; + "3") + echo "online defragment thresh: PAGESIZE" + ;; + esac + fi +} + +Usage() +{ + echo "*********************************************" + echo " usage:" + echo " runtest.sh args.in mount_point device " + echo "*********************************************" +} + +#*************************************************************** +# main +#*************************************************************** +if [ `id -ru` -ne 0 ];then + echo "You need to be root to RUN this test" + exit 1 +fi + +if [ "$3" = "" -o "$2" = "" -o "$1" = "" ];then + Usage + exit 1 +fi + +ARGS=$1 +MNT=$2 +DEV=$3 + +echo "btrfs online defragment test start" +while read args +do + echo "***$args***START***" + Parse_options $args + Setup + Btrfs_online_defrag + Checksum + Cleanup + FSCK + echo "***$args***END***" +done < $ARGS +echo "btrfs online defragment test done" -- 1.6.5.2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/3] xfstests: add btrfs online defragments QA test @ 2012-02-06 8:27 ` Liu Bo 0 siblings, 0 replies; 14+ messages in thread From: Liu Bo @ 2012-02-06 8:27 UTC (permalink / raw) To: linux-btrfs; +Cc: hch, xfs As the title shows, we port btrfs online defragments QA test into xfstests. Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com> --- 278 | 66 +++++++ 278.out | 125 ++++++++++++++ group | 1 + src/Makefile | 2 +- src/btrfs_online_defragment/Makefile | 17 ++ src/btrfs_online_defragment/args.in | 18 ++ src/btrfs_online_defragment/runtest.sh | 291 ++++++++++++++++++++++++++++++++ 7 files changed, 519 insertions(+), 1 deletions(-) create mode 100755 278 create mode 100644 278.out create mode 100644 src/btrfs_online_defragment/Makefile create mode 100644 src/btrfs_online_defragment/args.in create mode 100755 src/btrfs_online_defragment/runtest.sh diff --git a/278 b/278 new file mode 100755 index 0000000..be501cd --- /dev/null +++ b/278 @@ -0,0 +1,66 @@ +#! /bin/bash +# FS QA Test No. 278 +# +# Btrfs Online defragmentation tests +# +#----------------------------------------------------------------------- +# Copyright (c) 2012 Fujitsu Liu Bo. All Rights Reserved. +# +# 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 +#----------------------------------------------------------------------- +# +# creator +owner=liubo2009@cn.fujitsu.com + +seq=`basename $0` +echo "QA output created by $seq" +progs_dir="`pwd`/src/btrfs_online_defragment/" +tmp=tmp/$$ +defrag_args="$progs_dir/args.in" + +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +_runtest() +{ + $progs_dir/runtest.sh $defrag_args $SCRATCH_MNT $SCRATCH_DEV +} + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.defrag + +# real QA test starts here +_supported_fs xfs btrfs +_supported_os Linux + +_setup_testdir +## We require scratch so that we'll have free contiguous space +_require_scratch +_scratch_mkfs >/dev/null 2>&1 +_scratch_mount + +_require_defrag + +_runtest + +status=0 +exit diff --git a/278.out b/278.out new file mode 100644 index 0000000..f679df2 --- /dev/null +++ b/278.out @@ -0,0 +1,125 @@ +QA output created by 278 +btrfs online defragment test start +***1 1 1 1 1***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 1 1 1 1***END*** +***1 1 1 1 2***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: -1 +***1 1 1 1 2***END*** +***1 1 1 1 3***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: PAGESIZE +***1 1 1 1 3***END*** +***1 1 1 2 1***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: on +online defragment thresh: default(256K) +***1 1 1 2 1***END*** +***1 1 2 - -***START*** +a single file +online defragment range: default +online defragment compress: on +***1 1 2 - -***END*** +***1 6 1 1 1***START*** +a single file +online defragment range: start = 0 && 0 < len < file size +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 6 1 1 1***END*** +***1 1 1 1 1***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 1 1 1 1***END*** +***1 1 1 1 2***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: -1 +***1 1 1 1 2***END*** +***1 1 1 1 3***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: PAGESIZE +***1 1 1 1 3***END*** +***1 1 1 2 1***START*** +a single file +online defragment range: default +online defragment compress: off +online defragment flush: on +online defragment thresh: default(256K) +***1 1 1 2 1***END*** +***1 1 2 - -***START*** +a single file +online defragment range: default +online defragment compress: on +***1 1 2 - -***END*** +***1 2 1 1 1***START*** +a single file +online defragment range: start < 0 && 0 < len < file size +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 2 1 1 1***END*** +***1 3 1 1 1***START*** +a single file +online defragment range: start > file size && 0 < len < file size +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 3 1 1 1***END*** +***1 4 1 1 1***START*** +a single file +online defragment range: start = 0 && len < 0 +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 4 1 1 1***END*** +***1 5 1 1 1***START*** +a single file +online defragment range: start = 0 && len > file size +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 5 1 1 1***END*** +***1 6 1 1 1***START*** +a single file +online defragment range: start = 0 && 0 < len < file size +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***1 6 1 1 1***END*** +***2 1 1 1 1***START*** +a directory +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***2 1 1 1 1***END*** +***3 1 1 1 1***START*** +a filesystem +online defragment range: default +online defragment compress: off +online defragment flush: off +online defragment thresh: default(256K) +***3 1 1 1 1***END*** +btrfs online defragment test done diff --git a/group b/group index 99592d3..9dedd25 100644 --- a/group +++ b/group @@ -391,3 +391,4 @@ deprecated 275 auto rw 276 auto rw metadata 277 auto ioctl quick metadata +278 auto diff --git a/src/Makefile b/src/Makefile index 67250ee..cba2f58 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,7 +19,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ bulkstat_unlink_test_modified t_dir_offset t_futimens t_immutable \ stale_handle pwrite_mmap_blocked fstrim t_dir_offset2 -SUBDIRS = +SUBDIRS = btrfs_online_defragment LLDLIBS = $(LIBATTR) $(LIBHANDLE) $(LIBACL) diff --git a/src/btrfs_online_defragment/Makefile b/src/btrfs_online_defragment/Makefile new file mode 100644 index 0000000..e05700e --- /dev/null +++ b/src/btrfs_online_defragment/Makefile @@ -0,0 +1,17 @@ +TOPDIR = ../.. +include $(TOPDIR)/include/builddefs + +SCRIPTS = runtest.sh + +default: depend $(SCRIPTS) + +depend: .dep + +include $(BUILDRULES) + + +install: + $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/src/btrfs_online_defragment + $(INSTALL) -m 755 $(SCRIPTS) $(PKG_LIB_DIR)/src/btrfs_online_defragment + +-include .dep diff --git a/src/btrfs_online_defragment/args.in b/src/btrfs_online_defragment/args.in new file mode 100644 index 0000000..9c22dc9 --- /dev/null +++ b/src/btrfs_online_defragment/args.in @@ -0,0 +1,18 @@ +1 1 1 1 1 +1 1 1 1 2 +1 1 1 1 3 +1 1 1 2 1 +1 1 2 - - +1 6 1 1 1 +1 1 1 1 1 +1 1 1 1 2 +1 1 1 1 3 +1 1 1 2 1 +1 1 2 - - +1 2 1 1 1 +1 3 1 1 1 +1 4 1 1 1 +1 5 1 1 1 +1 6 1 1 1 +2 1 1 1 1 +3 1 1 1 1 diff --git a/src/btrfs_online_defragment/runtest.sh b/src/btrfs_online_defragment/runtest.sh new file mode 100755 index 0000000..7c4e07f --- /dev/null +++ b/src/btrfs_online_defragment/runtest.sh @@ -0,0 +1,291 @@ +#!/bin/sh +################################################################################ +# # +# Copyright (c) 2010 FUJITSU LIMITED # +# # +# 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; either version 2 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will 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 to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# # +# Author: Liu Bo <liubo2009@cn.fujitsu.com> # +# # +# # +################################################################################ + +#**************************************************************************** +# DEV: mount device # +# MNT: mount point # +# ARGS: test case argument set # +#**************************************************************************** + +TPATH="`pwd`/src/btrfs_online_defragment" +PAGESIZE=4096 +FILESIZE=0 + +Mkbtrfs() +{ +#****************************** +# mkfs.btrfs +#****************************** + umount $MNT &>/dev/null + umount $DEV &>/dev/null + + mkfs.btrfs $DEV &> /dev/null + + if [ $? -ne 0 ];then + echo "***this case FAIL on mkfs.btrfs***" + continue + fi +} + +Mountfs() +{ + mount $DEV $MNT +} + +Createfile() +{ + CNT=11999 + FILESIZE=48000 + if [ "$DEFRAG_TARGET" = "1" ];then + for i in `seq $CNT -1 0`; do + dd if=/dev/zero of=$MNT/tmp_file bs=4k count=1 conv=notrunc seek=$i oflag=sync &>/dev/null + done + # get md5sum + md5sum $MNT/tmp_file > /tmp/checksum + elif [ "$DEFRAG_TARGET" = "2" ];then + mkdir $MNT/tmp_dir + for i in `seq $CNT -1 0`; do + dd if=/dev/zero of=$MNT/tmp_dir/tmp_file bs=4k count=1 conv=notrunc seek=$i oflag=sync &>/dev/null + done + # get md5sum + md5sum $MNT/tmp_dir/tmp_file > /tmp/checksum + elif [ "$DEFRAG_TARGET" = "3" ];then + for i in `seq $CNT -1 0`; do + dd if=/dev/zero of=$MNT/tmp_file bs=4k count=1 conv=notrunc seek=$i oflag=sync &>/dev/null + done + # get md5sum + md5sum $MNT/tmp_file > /tmp/checksum + fi +} + +Setup() +{ +#****************************** +# first---mkfs.btrfs +#****************************** + Mkbtrfs + +#****************************** +# second---mount +#****************************** + Mountfs + +#****************************** +# third---create file +#****************************** + Createfile + +} + +Cleanup() +{ + rm -fr $MNT/* + + umount $MNT + if [ $? -ne 0 ];then + echo "umount failed!" + fi +} + +Btrfs_online_defrag() +{ + str="" + if [ "$FILE_RANGE" = "2" ];then + str="$str -s -1 -l $((FILESIZE / 2)) " + elif [ "$FILE_RANGE" = "3" ];then + str="$str -s $((FILESIZE + 1)) -l $((FILESIZE / 2)) " + HAVE_DEFRAG=1 + elif [ "$FILE_RANGE" = "4" ];then + str="$str -l -1 " + elif [ "$FILE_RANGE" = "5" ];then + str="$str -l $((FILESIZE + 1)) " + elif [ "$FILE_RANGE" = "6" ];then + str="$str -l $((FILESIZE / 2)) " + fi + + if [ "$DEFRAG_COMPRESS" = "2" ];then + str="$str -c " + fi + + if [ "$FLUSH" = "2" ];then + str="$str -f " + fi + + if [ "$THRESH" = "2" ];then + str="$str -t -1 " + elif [ "$THRESH" = "3" ];then + str="$str -t $PAGESIZE " + fi + + if [ "$str" != "" ]; then + btrfs filesystem defragment $str $MNT/tmp_file + else + if [ "$DEFRAG_TARGET" = "1" ];then + btrfs filesystem defragment $MNT/tmp_file + elif [ "$DEFRAG_TARGET" = "2" ];then + btrfs filesystem defragment $MNT/tmp_dir + elif [ "$DEFRAG_TARGET" = "3" ];then + btrfs filesystem defragment $MNT + fi + fi + ret_val=$? + sync + if [ $ret_val -ne 20 ];then + echo "btrfs filesystem defragment failed! err is $ret_val" + fi +} + +Checksum() +{ + md5sum -c /tmp/checksum > /dev/null 2>&1 + if [ $? -ne 0 ];then + echo "md5 checksum failed!" + fi +} + +FSCK() +{ + btrfsck $DEV > /dev/null 2>&1 + ret_val=$? + if [ $ret_val -ne 0 ];then + echo "*****btrfsck _FAIL_! err is $ret_val*****" + fi +} + +Parse_options() +{ + PASS=0 + if [ "`echo $args | grep "#"`" != "" ];then + PASS=1 + fi + + if [ $PASS -ne 1 ];then + DEFRAG_TARGET=`echo $args | awk -F ' ' '{ print $1 }'` + case $DEFRAG_TARGET in + "1") + echo "a single file" + ;; + "2") + echo "a directory" + ;; + "3") + echo "a filesystem" + ;; + esac + + FILE_RANGE=`echo $args | awk -F ' ' '{ print $2 }'` + case $FILE_RANGE in + "1") + echo "online defragment range: default" + ;; + "2") + echo "online defragment range: start < 0 && 0 < len < file size" + ;; + "3") + echo "online defragment range: start > file size && 0 < len < file size" + ;; + "4") + echo "online defragment range: start = 0 && len < 0" + ;; + "5") + echo "online defragment range: start = 0 && len > file size" + ;; + "6") + echo "online defragment range: start = 0 && 0 < len < file size" + ;; + esac + + DEFRAG_COMPRESS=`echo $args | awk -F ' ' '{ print $3 }'` + case $DEFRAG_COMPRESS in + "1") + echo "online defragment compress: off" + ;; + "2") + echo "online defragment compress: on" + esac + + FLUSH=`echo $args | awk -F ' ' '{ print $4 }'` + case $FLUSH in + "1") + echo "online defragment flush: off" + ;; + "2") + echo "online defragment flush: on" + ;; + esac + + THRESH=`echo $args | awk -F ' ' '{ print $5 }'` + case $THRESH in + "1") + echo "online defragment thresh: default(256K)" + ;; + "2") + echo "online defragment thresh: -1" + ;; + "3") + echo "online defragment thresh: PAGESIZE" + ;; + esac + fi +} + +Usage() +{ + echo "*********************************************" + echo " usage:" + echo " runtest.sh args.in mount_point device " + echo "*********************************************" +} + +#*************************************************************** +# main +#*************************************************************** +if [ `id -ru` -ne 0 ];then + echo "You need to be root to RUN this test" + exit 1 +fi + +if [ "$3" = "" -o "$2" = "" -o "$1" = "" ];then + Usage + exit 1 +fi + +ARGS=$1 +MNT=$2 +DEV=$3 + +echo "btrfs online defragment test start" +while read args +do + echo "***$args***START***" + Parse_options $args + Setup + Btrfs_online_defrag + Checksum + Cleanup + FSCK + echo "***$args***END***" +done < $ARGS +echo "btrfs online defragment test done" -- 1.6.5.2 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] xfstests: add btrfs online defragments QA test 2012-02-06 8:27 ` Liu Bo @ 2012-02-06 12:11 ` Christoph Hellwig -1 siblings, 0 replies; 14+ messages in thread From: Christoph Hellwig @ 2012-02-06 12:11 UTC (permalink / raw) To: Liu Bo; +Cc: linux-btrfs, xfs, hch On Mon, Feb 06, 2012 at 04:27:49PM +0800, Liu Bo wrote: > +_runtest() > +{ > + $progs_dir/runtest.sh $defrag_args $SCRATCH_MNT $SCRATCH_DEV please put the actual tests into test cases themselves instead of calling out into shell scripts under src. If you have common code shared between multiple tests please put them into common.defrag. > + > +# get standard environment, filters and checks > +. ./common.rc > +. ./common.filter > +. ./common.defrag > + > +# real QA test starts here > +_supported_fs xfs btrfs does it really support xfs? ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] xfstests: add btrfs online defragments QA test @ 2012-02-06 12:11 ` Christoph Hellwig 0 siblings, 0 replies; 14+ messages in thread From: Christoph Hellwig @ 2012-02-06 12:11 UTC (permalink / raw) To: Liu Bo; +Cc: hch, linux-btrfs, xfs On Mon, Feb 06, 2012 at 04:27:49PM +0800, Liu Bo wrote: > +_runtest() > +{ > + $progs_dir/runtest.sh $defrag_args $SCRATCH_MNT $SCRATCH_DEV please put the actual tests into test cases themselves instead of calling out into shell scripts under src. If you have common code shared between multiple tests please put them into common.defrag. > + > +# get standard environment, filters and checks > +. ./common.rc > +. ./common.filter > +. ./common.defrag > + > +# real QA test starts here > +_supported_fs xfs btrfs does it really support xfs? _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] xfstests: add btrfs online defragments QA test 2012-02-06 12:11 ` Christoph Hellwig @ 2012-02-07 1:21 ` Liu Bo -1 siblings, 0 replies; 14+ messages in thread From: Liu Bo @ 2012-02-07 1:21 UTC (permalink / raw) To: Christoph Hellwig; +Cc: linux-btrfs, xfs On 02/06/2012 08:11 PM, Christoph Hellwig wrote: > On Mon, Feb 06, 2012 at 04:27:49PM +0800, Liu Bo wrote: >> +_runtest() >> +{ >> + $progs_dir/runtest.sh $defrag_args $SCRATCH_MNT $SCRATCH_DEV > > please put the actual tests into test cases themselves instead of > calling out into shell scripts under src. If you have common code > shared between multiple tests please put them into common.defrag. > I see, will update it. >> + >> +# get standard environment, filters and checks >> +. ./common.rc >> +. ./common.filter >> +. ./common.defrag >> + >> +# real QA test starts here >> +_supported_fs xfs btrfs > > does it really support xfs? > sorry, my miss. Thanks for reviewing! thanks, liubo > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] xfstests: add btrfs online defragments QA test @ 2012-02-07 1:21 ` Liu Bo 0 siblings, 0 replies; 14+ messages in thread From: Liu Bo @ 2012-02-07 1:21 UTC (permalink / raw) To: Christoph Hellwig; +Cc: linux-btrfs, xfs On 02/06/2012 08:11 PM, Christoph Hellwig wrote: > On Mon, Feb 06, 2012 at 04:27:49PM +0800, Liu Bo wrote: >> +_runtest() >> +{ >> + $progs_dir/runtest.sh $defrag_args $SCRATCH_MNT $SCRATCH_DEV > > please put the actual tests into test cases themselves instead of > calling out into shell scripts under src. If you have common code > shared between multiple tests please put them into common.defrag. > I see, will update it. >> + >> +# get standard environment, filters and checks >> +. ./common.rc >> +. ./common.filter >> +. ./common.defrag >> + >> +# real QA test starts here >> +_supported_fs xfs btrfs > > does it really support xfs? > sorry, my miss. Thanks for reviewing! thanks, liubo > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3][RESEND] 251: fix cp -axT problem 2012-02-06 8:27 ` Liu Bo @ 2012-03-31 20:11 ` Christoph Hellwig -1 siblings, 0 replies; 14+ messages in thread From: Christoph Hellwig @ 2012-03-31 20:11 UTC (permalink / raw) To: Liu Bo; +Cc: linux-btrfs, hch, xfs Thanks, applied. ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3][RESEND] 251: fix cp -axT problem @ 2012-03-31 20:11 ` Christoph Hellwig 0 siblings, 0 replies; 14+ messages in thread From: Christoph Hellwig @ 2012-03-31 20:11 UTC (permalink / raw) To: Liu Bo; +Cc: hch, linux-btrfs, xfs Thanks, applied. _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-03-31 20:12 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-02-06 8:27 [PATCH 1/3][RESEND] xfstests: fix 251's cp -axT problem Liu Bo 2012-02-06 8:27 ` Liu Bo 2012-02-06 8:27 ` [PATCH 2/3][RESEND] xfstests: make 218 support btrfs Liu Bo 2012-02-06 8:27 ` Liu Bo 2012-03-31 20:12 ` [PATCH 2/3][RESEND] 218: " Christoph Hellwig 2012-03-31 20:12 ` Christoph Hellwig 2012-02-06 8:27 ` [PATCH 3/3] xfstests: add btrfs online defragments QA test Liu Bo 2012-02-06 8:27 ` Liu Bo 2012-02-06 12:11 ` Christoph Hellwig 2012-02-06 12:11 ` Christoph Hellwig 2012-02-07 1:21 ` Liu Bo 2012-02-07 1:21 ` Liu Bo 2012-03-31 20:11 ` [PATCH 1/3][RESEND] 251: fix cp -axT problem Christoph Hellwig 2012-03-31 20:11 ` Christoph Hellwig
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.