xfstests: fix internal _xfs_check to handle logdev etc
PATCH 1/1 xfstests: fix internal _xfs_check to handle logdev etc
Pull all of the old xfs_check script into common/rc:_xfs_check() so that it properly handles all options, including external log devices.
---
common/rc +12 -3
@@ -393,8 +393,8 @@ _xfs_check() { OPTS=" " DBOPTS=" " + USAGE="Usage: xfs_check [-fsvV] [-l logdev] [-i ino]... [-b bno]... special" - OPTIND=1 while getopts "b:fi:l:stvV" c do case $c in
@@ -410,8 +410,17 @@ _xfs_check() ;; esac done - ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1 - return $? + set -- extra $@ + shift $OPTIND + case $# in + 1) ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1 + status=$? + ;; + 2) echo $USAGE 1>&1 + status=2 + ;; + esac + return $status } _setup_large_ext4_fs()
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 3 lines · Eric Sandeen
Pull all of the old
xfs_checkscript into common/rc:_xfs_check() so that it properly handles all options, including external log devices.
I see changes only related to USAGE. iiuc, log devices are handled properly by current code.
Quoted 31 lines
Signed-off-by Eric Sandeen <[email protected]>---
common/rc +5
-3@@ -393,8 +393,8 @@ _xfs_check() { OPTS=" " DBOPTS=" " + USAGE="Usage: xfs_check [-fsvV] [-l logdev] [-i ino]... [-b bno]... special" - OPTIND=1 while getopts "b:fi:l:stvV" c do case $c in@@ -410,8 +410,17 @@ _xfs_check() ;; esac done - ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1 - return $? + set -- extra $@ + shift $OPTIND + case $# in + 1) ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1
common/rc _xfs_check() · line 426
Quoted 10 lines
common/rc +7
-0+ status=$? + ;; + 2) echo $USAGE 1>&1 + status=2 + ;; + esac + return $status } _setup_large_ext4_fs()
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 7 lines · Chandra Seetharaman
Quoted 3 lines · Eric Sandeen
Pull all of the old
xfs_checkscript into common/rc:_xfs_check() so that it properly handles all options, including external log devices.I see changes only related to USAGE. iiuc, log devices are handled properly by current code.
also:
Quoted 2 lines
common/rc _xfs_check() · line 414
Quoted 2 lines
common/rc +2
-0+ set -- extra $@ + shift $OPTIND
have you *tested* log devices w/ your original code? It failed for Michael and for myself, so... ;)
-Eric
Quoted 37 lines
Quoted 37 lines
Signed-off-by Eric Sandeen <[email protected]>---
common/rc +12
-3@@ -393,8 +393,8 @@ _xfs_check() { OPTS=" " DBOPTS=" " + USAGE="Usage: xfs_check [-fsvV] [-l logdev] [-i ino]... [-b bno]... special" - OPTIND=1 while getopts "b:fi:l:stvV" c do case $c in@@ -410,8 +410,17 @@ _xfs_check() ;; esac done - ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1 - return $? + set -- extra $@ + shift $OPTIND + case $# in + 1) ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1 + status=$? + ;; + 2) echo $USAGE 1>&1 + status=2 + ;; + esac + return $status }
Quoted 11 lines
common/rc _xfs_check() · line 426
Quoted 4 lines
common/rc +0
-0_setup_large_ext4_fs()_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 11 lines · Eric Sandeen
Quoted 7 lines · Chandra Seetharaman
Quoted 3 lines · Eric Sandeen
Pull all of the old
xfs_checkscript into common/rc:_xfs_check() so that it properly handles all options, including external log devices.I see changes only related to USAGE. iiuc, log devices are handled properly by current code.
also:
Quoted 7 lines
Quoted 2 lines
common/rc _xfs_check() · line 414
Quoted 2 lines
common/rc +2
-0+ set -- extra $@ + shift $OPTINDhave you *tested* log devices w/ your original code? It failed for Michael and for myself, so... ;)
-Eric
yikes. sorry :(
Quoted 38 lines
Quoted 38 lines
Quoted 38 lines
Signed-off-by Eric Sandeen <[email protected]>---
common/rc +12
-3@@ -393,8 +393,8 @@ _xfs_check() { OPTS=" " DBOPTS=" " + USAGE="Usage: xfs_check [-fsvV] [-l logdev] [-i ino]... [-b bno]... special" - OPTIND=1 while getopts "b:fi:l:stvV" c do case $c in@@ -410,8 +410,17 @@ _xfs_check() ;; esac done - ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1 - return $? + set -- extra $@ + shift $OPTIND + case $# in + 1) ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1 + status=$? + ;; + 2) echo $USAGE 1>&1 + status=2 + ;; + esac + return $status }
Quoted 12 lines
Quoted 11 lines
common/rc _xfs_check() · line 426
Quoted 4 lines
common/rc +0
-0_setup_large_ext4_fs()_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 15 lines · Chandra Seetharaman
Quoted 14 lines · Eric Sandeen
Quoted 7 lines · Chandra Seetharaman
Quoted 3 lines · Eric Sandeen
Pull all of the old
xfs_checkscript into common/rc:_xfs_check() so that it properly handles all options, including external log devices.I see changes only related to USAGE. iiuc, log devices are handled properly by current code.
also:
Quoted 2 lines
Quoted 2 lines
common/rc +2
-0+ set -- extra $@ + shift $OPTIND
Quoted 6 lines
Quoted 4 lines
have you *tested* log devices w/ your original code? It failed for Michael and for myself, so... ;)
-Eric
yikes. sorry :(
It's ok - I reviewed it, but I didn't test it. ;) It happens.
-Eric
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 16 lines · Eric Sandeen
Quoted 15 lines · Chandra Seetharaman
Quoted 14 lines · Eric Sandeen
Quoted 7 lines · Chandra Seetharaman
Quoted 3 lines · Eric Sandeen
Pull all of the old
xfs_checkscript into common/rc:_xfs_check() so that it properly handles all options, including external log devices.I see changes only related to USAGE. iiuc, log devices are handled properly by current code.
also:
Quoted 2 lines
Quoted 2 lines
common/rc +2
-0+ set -- extra $@ + shift $OPTIND
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines
have you *tested* log devices w/ your original code? It failed for Michael and for myself, so... ;)
-Eric
yikes. sorry :(
No worries, Chandra. I couldn't even get the echo line for Eric's patched version and execute the script in the same pass. There's something about debugging the passing of arguments in bash that is simply evil.
Quoted 4 lines
It's ok - I reviewed it, but I didn't test it. ;) It happens.
-Eric
Oh, so leave it to me to hack my lone swap partition on this PC into a two-segment dm-linear device so I can test this...OK...that was successful for a change! Even though git am complained about the whitespace (E-mail issue?), the patch worked as well.
Anyway, there are issues with these tests and whether the partitions are mounted at the time ./check is run, but that will be posted after my closing, just to put it out there that issues may exist in the mount checking. [And I'm sure that I did an export USE_EXTERNAL="yes", so it's surprising how the tests went about mounting.]
=====================================================================
This is how things went before using Eric's patch:
root@plbearer:/var/lib/xfstests# ./check generic/001
mount: wrong fs type, bad option, bad superblock on /dev/mapper/tData,
missing codepage or helper program, or other error
In some cases useful info is found in syslog - try
dmesg | tail or socommon/rc: retrying test device mount with external set
FSTYP -- xfs (non-debug)
PLATFORM -- Linux/i686 plbearer 3.8.11
_check_xfs_filesystem: filesystem on /dev/mapper/tData is inconsistent (c) (see .full) Passed all 0 tests
root@plbearer:/var/lib/xfstests# cat .full _check_xfs_filesystem: filesystem on /dev/mapper/tData is inconsistent *** xfs_check output *** Usage: xfs_check [-ifFrxV] [-p prog] [-l logdev] [-c cmd]... device *** end xfs_check output *** mount output *** /dev/sda1 on / type xfs (rw,uquota) proc on /proc type proc (rw) sysfs on /sys type sysfs (rw) /dev/sda6 on /alt_sys type xfs (ro) tmpfs on /dev/shm type tmpfs (rw) debugfs on /sys/kernel/debug type debugfs (rw) /dev/sdb1 on /media/uGeneral type f2fs (rw) *** end mount output
Here is the echo line of what command was run:/usr/sbin/xfs_db -l /dev/mapper/tLog -F -i -p xfs_check -c check -l/dev/mapper/tLog
=====================================================================
This is how things went after using Eric's patch:
root@plbearer:/var/lib/xfstests# ./check generic/001
mount: wrong fs type, bad option, bad superblock on /dev/mapper/tData,
missing codepage or helper program, or other error
In some cases useful info is found in syslog - try
dmesg | tail or socommon/rc: retrying test device mount with external set
FSTYP -- xfs (non-debug)
PLATFORM -- Linux/i686 plbearer 3.8.11
generic/001 7s
Ran: generic/001
Passed all 1 tests
Here is the echo line of what command was run:/usr/sbin/xfs_db -l /dev/mapper/tLog -F -i -p xfs_check -c check /dev/mapper/tData
=====================================================================
Anyway, thanks for the patch! It will put me back on track. This xfstests restructuring looks like a significant undertaking, and issues along the way are expected.
Good luck!
Michael
=====================================================================P.S. - This is what three passes in a row looks like, using Eric's patched version of ./check:
RUN #1
root@plbearer:/var/lib/xfstests# mount | grep mapper
root@plbearer:/var/lib/xfstests# ./check -xfs generic/001 generic/002
mount: wrong fs type, bad option, bad superblock on /dev/mapper/tData,
missing codepage or helper program, or other error
In some cases useful info is found in syslog - try
dmesg | tail or socommon/rc: retrying test device mount with external set
FSTYP -- xfs (non-debug)
PLATFORM -- Linux/i686 plbearer 3.8.11
generic/001 7s
generic/002 0s
Ran: generic/001 generic/002
Passed all 2 tests
RUN #2
root@plbearer:/var/lib/xfstests# mount | grep mapper /dev/mapper/tData on /mnt/testdir type xfs (rw,logdev=/dev/mapper/tLog)
root@plbearer:/var/lib/xfstests# ./check -xfs generic/001 generic/002 FSTYP -- xfs (non-debug) PLATFORM -- Linux/i686 plbearer 3.8.11
_check_xfs_filesystem: filesystem on /dev/mapper/tData has dirty log (see .full) _check_xfs_filesystem: filesystem on /dev/mapper/tData is inconsistent (c) (see .full) _check_xfs_filesystem: filesystem on /dev/mapper/tData is inconsistent (r) (see .full) Passed all 0 tests
RUN #3
root@plbearer:/var/lib/xfstests# mount | grep mapper
root@plbearer:/var/lib/xfstests# ./check -xfs generic/001 generic/002
mount: wrong fs type, bad option, bad superblock on /dev/mapper/tData,
missing codepage or helper program, or other error
In some cases useful info is found in syslog - try
dmesg | tail or socommon/rc: retrying test device mount with external set
FSTYP -- xfs (non-debug)
PLATFORM -- Linux/i686 plbearer 3.8.11
generic/001 7s
generic/002 1s
Ran: generic/001 generic/002
Passed all 2 tests
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 68 lines · Michael L. Semon
Quoted 16 lines · Eric Sandeen
Quoted 15 lines · Chandra Seetharaman
Quoted 14 lines · Eric Sandeen
Quoted 7 lines · Chandra Seetharaman
Quoted 3 lines · Eric Sandeen
Pull all of the old
xfs_checkscript into common/rc:_xfs_check() so that it properly handles all options, including external log devices.I see changes only related to USAGE. iiuc, log devices are handled properly by current code.
also:
Quoted 2 lines
Quoted 2 lines
common/rc +2
-0+ set -- extra $@ + shift $OPTINDQuoted 6 lines
Quoted 6 lines
Quoted 4 lines
have you *tested* log devices w/ your original code? It failed for Michael and for myself, so... ;)
-Eric
yikes. sorry :(
No worries, Chandra. I couldn't even get the echo line for Eric's patched version and execute the script in the same pass. There's something about debugging the passing of arguments in bash that is simply evil.
Quoted 4 lines
It's ok - I reviewed it, but I didn't test it. ;) It happens.
-Eric
Oh, so leave it to me to hack my lone swap partition on this PC into a two-segment dm-linear device so I can test this...OK...that was successful for a change! Even though
git amcomplained about the whitespace (E-mail issue?), the patch worked as well.Anyway, there are issues with these tests and whether the partitions are mounted at the time ./check is run, but that will be posted after my closing, just to put it out there that issues may exist in the mount checking. [And I'm sure that I did an
export USE_EXTERNAL="yes", so it's surprising how the tests went about mounting.]=====================================================================
This is how things went before using Eric's patch:root@plbearer:/var/lib/xfstests# ./check generic/001 mount: wrong fs type, bad option, bad superblock on /dev/mapper/tData, missing codepage or helper program, or other error In some cases useful info is found in syslog - try dmesg | tail or socommon/rc: retrying test device mount with external set
FSTYP -- xfs (non-debug)
PLATFORM -- Linux/i686 plbearer 3.8.11
_check_xfs_filesystem: filesystem on/dev/mapper/tDatais inconsistent (c) (see .full) Passed all 0 testsroot@plbearer:/var/lib/xfstests# cat .full _check_xfs_filesystem: filesystem on /dev/mapper/tData is inconsistent *** xfs_check output *** Usage: xfs_check [-ifFrxV] [-p prog] [-l logdev] [-c cmd]... device *** end xfs_check output *** mount output *** /dev/sda1 on / type xfs (rw,uquota) proc on /proc type proc (rw) sysfs on /sys type sysfs (rw) /dev/sda6 on /alt_sys type xfs (ro) tmpfs on /dev/shm type tmpfs (rw) debugfs on /sys/kernel/debug type debugfs (rw) /dev/sdb1 on /media/uGeneral type f2fs (rw) *** end mount outputHere is the echo line of what command was run:
/usr/sbin/xfs_db-l/dev/mapper/tLog-F -i -pxfs_check-c check -l/dev/mapper/tLog
Quoted 8 lines
=====================================================================
This is how things went after using Eric's patch:root@plbearer:/var/lib/xfstests# ./check generic/001 mount: wrong fs type, bad option, bad superblock on /dev/mapper/tData, missing codepage or helper program, or other error In some cases useful info is found in syslog - try dmesg | tail or so
Yeah this seems . . . suboptimal, I haven't looked into it.
If TEST_LOGDEV is set it seems like that should be the *first* thing to try. I don't recall if it did this before the reorganization.
FWIW, I've seen problems in the past when using devicemapper devices. One never knows what's a symlink ;)
If you specify /dev/dm-X instead of the pretty name, does it go any better for you?
(I don't remember if that helped; I remember chasing dm issues before. I just don't use dm in my testing anymore, TBH) :)
-Eric
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 17 lines · Eric Sandeen
Quoted 8 lines
=====================================================================
This is how things went after using Eric's patch:root@plbearer:/var/lib/xfstests# ./check generic/001 mount: wrong fs type, bad option, bad superblock on /dev/mapper/tData, missing codepage or helper program, or other error In some cases useful info is found in syslog - try dmesg | tail or soYeah this seems . . . suboptimal, I haven't looked into it.
If
TEST_LOGDEVis set it seems like that should be the *first* thing to try. I don't recall if it did this before the reorganization.FWIW, I've seen problems in the past when using devicemapper devices. One never knows what's a symlink ;)
Quoted 7 lines
If you specify
/dev/dm-Xinstead of the pretty name, does it go any better for you?(I don't remember if that helped; I remember chasing dm issues before. I just don't use dm in my testing anymore, TBH) :)
-Eric
Ugh, that was a rather sobering experience. Lesson learned. To use /dev/dm-X goes much worse. The /dev/dm-0 for logdev goes untranslated, but the /dev/dm-1 seems to get auto-translated back to /dev/mapper/tData (more commentary after this):
======================================================================
root@plbearer:~# export TEST_DEV=/dev/dm-1 root@plbearer:~# export TEST_LOGDEV=/dev/dm-0 root@plbearer:~# export USE_EXTERNAL="yes" root@plbearer:~# cd /var/lib/xfstests/
root@plbearer:/var/lib/xfstests# mount | grep mapper /dev/mapper/tData on /mnt/testdir type xfs (rw,logdev=/dev/mapper/tLog)
root@plbearer:/var/lib/xfstests# ./check generic/001 generic/002 mount: /dev/mapper/tData already mounted or /mnt/testdir busy mount: according to mtab, /dev/mapper/tData is already mounted on /mnt/testdir common/rc: retrying test device mount with external set mount: /dev/mapper/tData already mounted or /mnt/testdir busy mount: according to mtab, /dev/mapper/tData is already mounted on /mnt/testdir common/rc: could not mount /dev/dm-1 on /mnt/testdir
root@plbearer:/var/lib/xfstests# ./check generic/001 generic/002 mount: /dev/mapper/tData already mounted or /mnt/testdir busy mount: according to mtab, /dev/mapper/tData is already mounted on /mnt/testdir common/rc: retrying test device mount with external set mount: /dev/mapper/tData already mounted or /mnt/testdir busy mount: according to mtab, /dev/mapper/tData is already mounted on /mnt/testdir common/rc: could not mount /dev/dm-1 on /mnt/testdir
root@plbearer:/var/lib/xfstests# umount $TEST_DEV
root@plbearer:/var/lib/xfstests# ./check generic/001 generic/002 common/rc: Error: $TEST_DEV (/dev/dm-1) is not a MOUNTED xfs filesystem Filesystem Type 1K-blocks Used Available Use% Mounted on - - 385460 0 385460 0% /dev
root@plbearer:/var/lib/xfstests# ./check generic/001 generic/002 mount: /dev/mapper/tData already mounted or /mnt/testdir busy mount: according to mtab, /dev/mapper/tData is already mounted on /mnt/testdir common/rc: retrying test device mount with external set mount: /dev/mapper/tData already mounted or /mnt/testdir busy mount: according to mtab, /dev/mapper/tData is already mounted on /mnt/testdir common/rc: could not mount /dev/dm-1 on /mnt/testdir
root@plbearer:/var/lib/xfstests# umount $TEST_DEV
root@plbearer:/var/lib/xfstests# mount -t xfs -o logdev=$TEST_LOGDEV $TEST_DEV $TEST_DIR
root@plbearer:/var/lib/xfstests# mount | grep mapper /dev/mapper/tData on /mnt/testdir type xfs (rw,logdev=/dev/dm-0)
root@plbearer:/var/lib/xfstests# echo $TEST_DEV /dev/dm-1
======================================================================
So I got rid of the linear objects, went to cfdisk, brewed up some good-old-fashioned MBR logical partitions, and then...
======================================================================
root@plbearer:~# mkfs.xfs -l logdev=/dev/sda5 /dev/sda6
meta-data=/dev/sda6 isize=256 agcount=4, agsize=69774 blks
= sectsz=512 attr=2, projid32bit=0
data = bsize=4096 blocks=279095, imaxpct=25
= sunit=0 swidth=0 blks
naming =version 2 bsize=4096 ascii-ci=0
log =/dev/sda5 bsize=4096 blocks=16057, version=2
= sectsz=512 sunit=0 blks, lazy-count=1
realtime =none extsz=4096 blocks=0, rtextents=0root@plbearer:~# export TEST_DEV=/dev/sda6 root@plbearer:~# export TEST_LOGDEV=/dev/sda5 root@plbearer:~# export TEST_DIR=/mnt/testdir root@plbearer:~# export USE_EXTERNAL="yes" root@plbearer:~# cd /var/lib/xfstests/
root@plbearer:/var/lib/xfstests# ./check generic/001 generic/002 FSTYP -- xfs (non-debug) PLATFORM -- Linux/i686 plbearer 3.8.11
generic/001 7s
generic/002 1s
Ran: generic/001 generic/002
Passed all 2 tests
root@plbearer:/var/lib/xfstests# ./check generic/001 generic/002 FSTYP -- xfs (non-debug) PLATFORM -- Linux/i686 plbearer 3.8.11
generic/001 6s
generic/002 1s
Ran: generic/001 generic/002
Passed all 2 tests
root@plbearer:/var/lib/xfstests# ./check generic/001 generic/002 FSTYP -- xfs (non-debug) PLATFORM -- Linux/i686 plbearer 3.8.11
generic/001 7s
generic/002 1s
Ran: generic/001 generic/002
Passed all 2 tests
======================================================================
And here's how it runs on bare partitions after reversing the patch and reinstalling xfstests, as a sort of check figure...
======================================================================
root@plbearer:/var/lib/xfstests# ./check generic/001 generic/002 FSTYP -- xfs (non-debug) PLATFORM -- Linux/i686 plbearer 3.8.11
_check_xfs_filesystem: filesystem on /dev/sda6 is inconsistent (c) (see .full) Passed all 0 tests
root@plbearer:/var/lib/xfstests# ./check generic/001 generic/002 FSTYP -- xfs (non-debug) PLATFORM -- Linux/i686 plbearer 3.8.11
_check_xfs_filesystem: filesystem on /dev/sda6 is inconsistent (c) (see .full) Passed all 0 tests
======================================================================
So I'll consider this problem solved as well as another trial-by-fire lesson in using the device-mapper objects. Thanks again!
Michael
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
On 5/2/13 4:54 PM, Michael L. Semon wrote:
...
Quoted 3 lines
So I'll consider this problem solved as well as another trial-by-fire lesson in using the device-mapper objects. Thanks again!
Michael
well . . . it *should* work. :(
Feel free to send patches to make it work. :)
-Eric
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Thanks Eric, this patch has been committeed.
--Rich
commit 120752942a542742a32aafa2cd5d247f3e0d1479
Author: Eric Sandeen <[email protected]> Date: Thu May 2 14:53:19 2013 +0000
xfstests: fix internal _xfs_check to handle logdev etc
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs