From patchwork Fri Apr 26 18:45:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 2495311 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E3B5BDF230 for ; Fri, 26 Apr 2013 18:45:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757256Ab3DZSpb (ORCPT ); Fri, 26 Apr 2013 14:45:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56398 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754361Ab3DZSpa (ORCPT ); Fri, 26 Apr 2013 14:45:30 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3QIjN7g022929 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 26 Apr 2013 14:45:23 -0400 Received: from liberator.sandeen.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3QIjMsk031158 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Fri, 26 Apr 2013 14:45:22 -0400 Message-ID: <517ACB41.2030002@redhat.com> Date: Fri, 26 Apr 2013 13:45:21 -0500 From: Eric Sandeen User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130328 Thunderbird/17.0.5 MIME-Version: 1.0 To: xfs-oss CC: linux-btrfs , Liu Bo Subject: [PATCH] xfstests btrfs/284: shorten duration, fix output X-Enigmail-Version: 1.5.1 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org test 284 had... some issues. First, it took so long nobody ran it; so shorten the extent count by a factor of about 100. Having fixed that, we see failures in 2 cases; when start or len is -1, but the golden output file didn't have error output, as if they should pass. I'm going to argue that these *should* both fail; start = -1 has no real meaning. length = -1 might mean "the rest of the file" but if that's what you really want, just don't specify -l. So add failure output for those cases. Send all command output to $seq.full, in case that changes in the future; just capture the return value. Then remove the return value echo on failure (50?) because who knows when that might change to some other magic value. Ok, then when defrag actually works, old defrag returned "20" (because?) but a recent commit changed it to 0. So accommodate that too. And remove a stray "HAVE_DEFRAG=1" while we're at it. That variable is never used. Signed-off-by: Eric Sandeen Reviewed-by: Josef Bacik Reviewed-by: Liu Bo --- -- 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 diff --git a/tests/btrfs/284 b/tests/btrfs/284 old mode 100644 new mode 100755 index d952977..67161a3 --- a/tests/btrfs/284 +++ b/tests/btrfs/284 @@ -26,7 +26,7 @@ seqres=$RESULT_DIR/$seq echo "QA output created by $seq" here="`pwd`" tmp=/tmp/$$ -cnt=11999 +cnt=119 filesize=48000 status=1 # failure is the default! @@ -58,11 +58,12 @@ _create_file() _btrfs_online_defrag() { str="" + # start = -1 is invalid, should fail if [ "$2" = "2" ];then str="$str -s -1 -l $((filesize / 2)) " elif [ "$2" = "3" ];then str="$str -s $((filesize + 1)) -l $((filesize / 2)) " - HAVE_DEFRAG=1 + # len = -1 is invalid, should fail elif [ "$2" = "4" ];then str="$str -l -1 " elif [ "$2" = "5" ];then @@ -76,20 +77,22 @@ _btrfs_online_defrag() fi if [ "$str" != "" ]; then - $BTRFS_UTIL_PROG filesystem defragment $str $SCRATCH_MNT/tmp_file + $BTRFS_UTIL_PROG filesystem defragment $str $SCRATCH_MNT/tmp_file >> $seq.full 2>&1 else if [ "$1" = "1" ];then - $BTRFS_UTIL_PROG filesystem defragment $SCRATCH_MNT/tmp_file + $BTRFS_UTIL_PROG filesystem defragment $SCRATCH_MNT/tmp_file >> $seq.full 2>&1 elif [ "$1" = "2" ];then - $BTRFS_UTIL_PROG filesystem defragment $SCRATCH_MNT/tmp_dir + $BTRFS_UTIL_PROG filesystem defragment $SCRATCH_MNT/tmp_dir >> $seq.full 2>&1 elif [ "$1" = "3" ];then - $BTRFS_UTIL_PROG filesystem defragment $SCRATCH_MNT + $BTRFS_UTIL_PROG filesystem defragment $SCRATCH_MNT >> $seq.full 2>&1 fi fi ret_val=$? _scratch_remount - if [ $ret_val -ne 20 ];then - echo "btrfs filesystem defragment failed! err is $ret_val" + # Older defrag returned "20" for success + # e9393c2 btrfs-progs: defrag return zero on success + if [ $ret_val -ne 0 -a $ret_val -ne 20 ]; then + echo "btrfs filesystem defragment failed!" fi } @@ -140,19 +143,19 @@ _scratch_mount _require_defrag echo "defrag object | defragment range | defragment compress" -echo "a single file | default | off" +echo "a single file | default | off" _rundefrag 1 1 1 echo "a single file | default | on" _rundefrag 1 1 2 -echo "a single file | start < 0 && 0 < len < file size | off" +echo "a single file | start < 0 && 0 < len < file size | off (should fail)" _rundefrag 1 2 1 echo "a single file | start > file size && 0 < len < file size | off" _rundefrag 1 3 1 -echo "a single file | start = 0 && len < 0 | off" +echo "a single file | start = 0 && len < 0 | off (should fail)" _rundefrag 1 4 1 echo "a single file | start = 0 && len > file size | off" diff --git a/tests/btrfs/284.out b/tests/btrfs/284.out index 4a69f82..c942271 100644 --- a/tests/btrfs/284.out +++ b/tests/btrfs/284.out @@ -1,10 +1,12 @@ QA output created by 284 defrag object | defragment range | defragment compress -a single file | default | off +a single file | default | off a single file | default | on -a single file | start < 0 && 0 < len < file size | off +a single file | start < 0 && 0 < len < file size | off (should fail) +btrfs filesystem defragment failed! a single file | start > file size && 0 < len < file size | off -a single file | start = 0 && len < 0 | off +a single file | start = 0 && len < 0 | off (should fail) +btrfs filesystem defragment failed! a single file | start = 0 && len > file size | off a single file | start = 0 && 0 < len < file size | off a directory | default | off