xfstests: a couple of fixes for external logs
PATCH 1/1 xfstests: a couple of fixes for external logs
Fix a couple of issues when running xfsqa with external logs:
- update the 096 golden output for the external log case
- add a new _scratch_xfs_check similar to _scratch_xfs_logprint and _scratch_xfs_repair that take the log device into account and use it in test 134
- use _scratch_xfs_repair in test 202 to fix it for external log devices
017 +1 -1
@@ -67,7 +67,7 @@ echo "" >>$seq.full echo "*** XFS_CHECK ***" >>$seq.full echo "" >>$seq.full - xfs_check $checkopts $SCRATCH_DEV >>$seq.full 2>&1 \ + _scratch_xfs_check $checkopts >>$seq.full 2>&1 \ || _fail "xfs_check $checkopts failed" _scratch_mount -o remount,rw \ || _fail "remount rw failed"
common.rc +8 -0
@@ -268,6 +268,14 @@ $XFS_LOGPRINT_PROG $SCRATCH_OPTIONS $* $SCRATCH_DEV } +_scratch_xfs_check() +{ + SCRATCH_OPTIONS="" + [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \ + SCRATCH_OPTIONS="-l $SCRATCH_LOGDEV" + $XFS_CHECK_PROG $SCRATCH_OPTIONS $* $SCRATCH_DEV +} + _scratch_xfs_repair() { SCRATCH_OPTIONS=""
202 +3 -2
@@ -20,6 +20,7 @@ # get standard environment, filters and checks . ./common.rc . ./common.filter +. ./common.repair # real QA test starts here _supported_fs xfs
@@ -31,10 +32,10 @@ _scratch_mkfs_xfs -d agcount=1 >/dev/null 2>&1 echo "== Trying to repair it (should fail) ==" -xfs_repair $SCRATCH_DEV +_scratch_xfs_repair echo "== Trying to repair it with -o force_geometry ==" -xfs_repair -o force_geometry $SCRATCH_DEV +_scratch_xfs_repair -o force_geometry 2>&1 | _filter_repair # success, all done echo "*** done"
202.out +1 -3
@@ -6,19 +6,17 @@ Use the -o force_geometry option to proceed. == Trying to repair it with -o force_geometry == Phase 1 - find and verify superblock... -Phase 2 - using internal log +Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps... - found root inode chunk Phase 3 - for each AG... - scan and clear agi unlinked lists... - process known inodes and perform inode discovery... - - agno = 0 - process newly discovered inodes... Phase 4 - check for duplicate blocks... - setting up duplicate extent list... - check for inodes claiming duplicate blocks... - - agno = 0 Phase 5 - rebuild AG headers and trees... - reset superblock... Phase 6 - check inode connectivity...
096.external +2 -2
@@ -30,7 +30,7 @@ # test out data stripe ---- mkfs=-d su=266240,sw=1 --- +--- mkfs=-l version=1 -d su=266240,sw=1 --- meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=25 = sunit=65 swidth=65 blks, unwritten=1
@@ -41,7 +41,7 @@ # test out data stripe the same but using sunit & swidth ---- mkfs=-d sunit=520,swidth=520 --- +--- mkfs=-l version=1 -d sunit=520,swidth=520 --- meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=25 = sunit=65 swidth=65 blks, unwritten=1
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
ping?
Quoted 116 lines · Christoph Hellwig
Fix a couple of issues when running xfsqa with external logs:
- update the 096 golden output for the external log case
- add a new_scratch_xfs_checksimilar to_scratch_xfs_logprintand_scratch_xfs_repairthat take the log device into account and use it in test 134
- use_scratch_xfs_repairin test 202 to fix it for external log devicesSigned-off-by Christoph Hellwig <[email protected]>Index: xfstests-dev/017
===================================================================017 +1
-1@@ -67,7 +67,7 @@ echo "" >>$seq.full echo "*** XFS_CHECK ***" >>$seq.full echo "" >>$seq.full - xfs_check $checkopts $SCRATCH_DEV >>$seq.full 2>&1 \ + _scratch_xfs_check $checkopts >>$seq.full 2>&1 \ || _fail "xfs_check $checkopts failed" _scratch_mount -o remount,rw \ || _fail "remount rw failed"Index: xfstests-dev/common.rc
===================================================================common.rc +8
-0@@ -268,6 +268,14 @@ $XFS_LOGPRINT_PROG $SCRATCH_OPTIONS $* $SCRATCH_DEV } +_scratch_xfs_check() +{ + SCRATCH_OPTIONS="" + [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \ + SCRATCH_OPTIONS="-l $SCRATCH_LOGDEV" + $XFS_CHECK_PROG $SCRATCH_OPTIONS $* $SCRATCH_DEV +} + _scratch_xfs_repair() { SCRATCH_OPTIONS=""Index: xfstests-dev/202
===================================================================202 +3
-2@@ -20,6 +20,7 @@ # get standard environment, filters and checks . ./common.rc . ./common.filter +. ./common.repair # real QA test starts here _supported_fs xfs@@ -31,10 +32,10 @@ _scratch_mkfs_xfs -d agcount=1 >/dev/null 2>&1 echo "== Trying to repair it (should fail) ==" -xfs_repair $SCRATCH_DEV +_scratch_xfs_repair echo "== Trying to repair it with -o force_geometry ==" -xfs_repair -o force_geometry $SCRATCH_DEV +_scratch_xfs_repair -o force_geometry 2>&1 | _filter_repair # success, all done echo "*** done"Index: xfstests-dev/202.out
===================================================================202.out +1
-3@@ -6,19 +6,17 @@ Use the -o force_geometry option to proceed. == Trying to repair it with -o force_geometry == Phase 1 - find and verify superblock... -Phase 2 - using internal log +Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps... - found root inode chunk Phase 3 - for each AG... - scan and clear agi unlinked lists... - process known inodes and perform inode discovery... - - agno = 0 - process newly discovered inodes... Phase 4 - check for duplicate blocks... - setting up duplicate extent list... - check for inodes claiming duplicate blocks... - - agno = 0 Phase 5 - rebuild AG headers and trees... - reset superblock... Phase 6 - check inode connectivity...Index: xfstests-dev/096.external
===================================================================096.external +2
-2@@ -30,7 +30,7 @@ # test out data stripe ---- mkfs=-d su=266240,sw=1 --- +--- mkfs=-l version=1 -d su=266240,sw=1 --- meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=25 = sunit=65 swidth=65 blks, unwritten=1@@ -41,7 +41,7 @@ # test out data stripe the same but using sunit & swidth ---- mkfs=-d sunit=520,swidth=520 --- +--- mkfs=-l version=1 -d sunit=520,swidth=520 --- meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=25 = sunit=65 swidth=65 blks, unwritten=1
Quoted 4 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
---end quoted text---
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 10 lines · Christoph Hellwig
Fix a couple of issues when running xfsqa with external logs:
- update the 096 golden output for the external log case
- add a new_scratch_xfs_checksimilar to_scratch_xfs_logprintand_scratch_xfs_repairthat take the log device into account and use it in test 134
- use_scratch_xfs_repairin test 202 to fix it for external log devicesSigned-off-by Christoph Hellwig <[email protected]>
Quoted 105 lines
Index: xfstests-dev/017
===================================================================017 +1
-1@@ -67,7 +67,7 @@ echo "" >>$seq.full echo "*** XFS_CHECK ***" >>$seq.full echo "" >>$seq.full - xfs_check $checkopts $SCRATCH_DEV >>$seq.full 2>&1 \ + _scratch_xfs_check $checkopts >>$seq.full 2>&1 \ || _fail "xfs_check $checkopts failed" _scratch_mount -o remount,rw \ || _fail "remount rw failed"Index: xfstests-dev/common.rc
===================================================================common.rc +8
-0@@ -268,6 +268,14 @@ $XFS_LOGPRINT_PROG $SCRATCH_OPTIONS $* $SCRATCH_DEV } +_scratch_xfs_check() +{ + SCRATCH_OPTIONS="" + [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \ + SCRATCH_OPTIONS="-l $SCRATCH_LOGDEV" + $XFS_CHECK_PROG $SCRATCH_OPTIONS $* $SCRATCH_DEV +} + _scratch_xfs_repair() { SCRATCH_OPTIONS=""Index: xfstests-dev/202
===================================================================202 +3
-2@@ -20,6 +20,7 @@ # get standard environment, filters and checks . ./common.rc . ./common.filter +. ./common.repair # real QA test starts here _supported_fs xfs@@ -31,10 +32,10 @@ _scratch_mkfs_xfs -d agcount=1 >/dev/null 2>&1 echo "== Trying to repair it (should fail) ==" -xfs_repair $SCRATCH_DEV +_scratch_xfs_repair echo "== Trying to repair it with -o force_geometry ==" -xfs_repair -o force_geometry $SCRATCH_DEV +_scratch_xfs_repair -o force_geometry 2>&1 | _filter_repair # success, all done echo "*** done"Index: xfstests-dev/202.out
===================================================================202.out +1
-3@@ -6,19 +6,17 @@ Use the -o force_geometry option to proceed. == Trying to repair it with -o force_geometry == Phase 1 - find and verify superblock... -Phase 2 - using internal log +Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps... - found root inode chunk Phase 3 - for each AG... - scan and clear agi unlinked lists... - process known inodes and perform inode discovery... - - agno = 0 - process newly discovered inodes... Phase 4 - check for duplicate blocks... - setting up duplicate extent list... - check for inodes claiming duplicate blocks... - - agno = 0 Phase 5 - rebuild AG headers and trees... - reset superblock... Phase 6 - check inode connectivity...Index: xfstests-dev/096.external
===================================================================096.external +2
-2@@ -30,7 +30,7 @@ # test out data stripe ---- mkfs=-d su=266240,sw=1 --- +--- mkfs=-l version=1 -d su=266240,sw=1 --- meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=25 = sunit=65 swidth=65 blks, unwritten=1@@ -41,7 +41,7 @@ # test out data stripe the same but using sunit & swidth ---- mkfs=-d sunit=520,swidth=520 --- +--- mkfs=-l version=1 -d sunit=520,swidth=520 --- meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=25 = sunit=65 swidth=65 blks, unwritten=1
Quoted 5 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs