xfs
[Top] [All Lists]

Re: [PATCH] 030: fix for new xfs_repair versions

To: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Subject: Re: [PATCH] 030: fix for new xfs_repair versions
From: Mark Tinguely <tinguely@xxxxxxx>
Date: Mon, 02 Apr 2012 09:35:10 -0500
Cc: xfs@xxxxxxxxxxx
In-reply-to: <20120331232836.GA19572@xxxxxxxxxxxxx>
References: <20120331232836.GA19572@xxxxxxxxxxxxx>
User-agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:9.0) Gecko/20120122 Thunderbird/9.0
On 03/31/12 18:28, Christoph Hellwig wrote:
Given that we now drop invalid unlinked inode lists there is no message
to capture.  Also add a sed expression to avoid failures on old repair
versions.

Signed-off-by: Christoph Hellwig<hch@xxxxxx>

Index: xfstests-dev/030
===================================================================
--- xfstests-dev.orig/030       2012-03-31 23:15:11.000000000 +0000
+++ xfstests-dev/030    2012-03-31 23:18:31.000000000 +0000
@@ -55,7 +55,8 @@ _check_ag()
        for structure in 'sb 0' 'agf 0' 'agi 0' 'agfl 0'
        do
                echo "Corrupting $structure - setting bits to $1"
-               _check_repair $1 "$structure"
+               _check_repair $1 "$structure" |
+                       sed -e 's/error following ag 0 unlinked list//'
        done
  }

@@ -97,8 +98,7 @@ src/devzero -v -1 -n "$clear" $SCRATCH_D

  # now kick off the real repair test...
  #
-_scratch_mkfs_xfs $DSIZE | _filter_mkfs | \
-    sed -e 's/error following ag 0 unlinked list//' 2>$tmp.mkfs
+_scratch_mkfs_xfs $DSIZE | _filter_mkfs 2>$tmp.mkfs
  . $tmp.mkfs
  _check_ag 0
  _check_ag -1
Index: xfstests-dev/030.out.linux
===================================================================
--- xfstests-dev.orig/030.out.linux     2012-03-31 23:19:09.000000000 +0000
+++ xfstests-dev/030.out.linux  2012-03-31 23:19:17.000000000 +0000
@@ -85,7 +85,6 @@ bad agbno AGBNO for inobt root, agno 0
  root inode chunk not found
  Phase 3 - for each AG...
          - scan and clear agi unlinked lists...
-error following ag 0 unlinked list
          - process known inodes and perform inode discovery...
          - process newly discovered inodes...
  Phase 4 - check for duplicate blocks...

_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs

The sed left a blank line where where the "error following ag 0 unlinked list" would have been in an 3.0.x kernel run of the test.

Maybe add another "sed -e '/^$/d'" to the filter?

--Mark Tinguely <tinguely@xxxxxxx>

<Prev in Thread] Current Thread [Next in Thread>