Make some log recover tests work on other platforms -

don't print out $SCRATCH_MNT. Also test 64K v2 logs.
don't output $SCRATCH_MNT which varies on hosts

diff --git a/085 b/085
index 747c1093ba958653693ccc90d1e336966d5e1b02..8e46baa400e40a339beeefb2fa6be17e785292fc 100755 (executable)
--- a/085
+++ b/085
@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 084
+# XFS QA Test No. 085
 #
 # To test log replay by shutdown of file system
 # This is the first simple initial test to ensure that
@@ -124,7 +124,7 @@ grep recovery $tmp.comm |\
 sed -e 's/.*Start/Start/' -e 's/system:.*/system/' \
     -e 's/.*End/End/'
 
-echo "ls $SCRATCH_MNT"
+echo "ls SCRATCH_MNT"
 ls $SCRATCH_MNT
 
 echo "unmount"

diff --git a/085.out b/085.out
index ebe27274485a7f5c121b7b36c407c3557a326367..ce480ed75d3fbc2753608f582e0a4fa12d36e35f 100644 (file)
--- a/085.out
+++ b/085.out
@@ -10,7 +10,7 @@ mount with replay
 check syslog for recovery...
 Starting XFS recovery on filesystem
 Ending XFS recovery on filesystem
-ls /mnt/scratch
+ls SCRATCH_MNT
 00
 01
 02

diff --git a/086 b/086
index 2dcb3397a553ae28f09ade8a10c2a14a4f549415..56166ee8878299c61c3960ff2ea7158851e560ba 100755 (executable)
--- a/086
+++ b/086
@@ -65,14 +65,7 @@ cat >$tmp.seq.params <<EOF
   -lversion=2          -ologbsize=32k
   -lversion=2,su=4096  -ologbsize=32k
   -lversion=2,su=32768 -ologbsize=32k
-#
-# expect following line to fail
-#
-  -lversion=2,su=36864 -ologbsize=32k
-#
-# following is not a power of 2 BBs 
-#
-  -lversion=2,su=5120  -ologbsize=32k
+  -lversion=2,su=32768 -ologbsize=64k
 EOF
 
 # Do the work for various log params which
@@ -123,7 +116,7 @@ for s in sync nosync ; do
        fi
 
        # check before on what FS should look like
-       _echofull "ls $SCRATCH_MNT"
+       _echofull "ls SCRATCH_MNT"
        ls $SCRATCH_MNT
 
        _echofull "godown"
@@ -141,7 +134,7 @@ for s in sync nosync ; do
            || _fail "mount failed: $MOUNT_OPTIONS"
 
        # check on what FS looks like after log recovery
-       _echofull "ls $SCRATCH_MNT"
+       _echofull "ls SCRATCH_MNT"
        ls $SCRATCH_MNT
 
        _echofull "unmount"

diff --git a/086.out b/086.out
index 6a2796dea6aba452485823a35e04724f0388829a..7a9b890e2fc759cad4b488219e6f3cc9bd4ee413 100644 (file)
--- a/086.out
+++ b/086.out
@@ -8,7 +8,7 @@ QA output created by 086
 *** mount ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -124,7 +124,7 @@ dirty log
 *** mount with replay ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -244,7 +244,7 @@ clean log
 *** mount ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -360,7 +360,7 @@ dirty log
 *** mount with replay ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -480,7 +480,7 @@ clean log
 *** mount ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -596,7 +596,7 @@ dirty log
 *** mount with replay ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -708,7 +708,7 @@ clean log
 
 *** filesystem is checked ok ***
 
---- mkfs=-lversion=2,su=36864, mnt=-ologbsize=32k, sync=sync ---
+--- mkfs=-lversion=2,su=32768, mnt=-ologbsize=64k, sync=sync ---
 
 *** mkfs ***
 
@@ -716,17 +716,233 @@ clean log
 *** mount ***
 
 
-*** mount failed: -ologbsize=32k ***
+*** ls SCRATCH_MNT ***
 
---- mkfs=-lversion=2,su=5120, mnt=-ologbsize=32k, sync=sync ---
+00
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
 
-*** mkfs ***
+*** godown ***
+
+
+*** unmount ***
+
+
+*** logprint after going down... ***
+
+dirty log
 
+*** mount with replay ***
+
+
+*** ls SCRATCH_MNT ***
+
+00
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
 
-*** Cannot mkfs for this test using option specified: -lversion=2,su=5120 -lsize=2000b ***
+*** unmount ***
+
+
+*** logprint after mount and replay... ***
 
+clean log
 
-*** mkfs failed: -lversion=2,su=5120 ***
+*** filesystem is checked ok ***
 
 --- mkfs=-lversion=2, mnt=-ologbsize=32k, sync=nosync ---
 
@@ -736,7 +952,7 @@ clean log
 *** mount ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -852,7 +1068,7 @@ dirty log
 *** mount with replay ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -972,7 +1188,7 @@ clean log
 *** mount ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -1088,7 +1304,7 @@ dirty log
 *** mount with replay ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -1208,7 +1424,7 @@ clean log
 *** mount ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -1324,7 +1540,7 @@ dirty log
 *** mount with replay ***
 
 
-*** ls /mnt/scratch ***
+*** ls SCRATCH_MNT ***
 
 00
 01
@@ -1436,7 +1652,7 @@ clean log
 
 *** filesystem is checked ok ***
 
---- mkfs=-lversion=2,su=36864, mnt=-ologbsize=32k, sync=nosync ---
+--- mkfs=-lversion=2,su=32768, mnt=-ologbsize=64k, sync=nosync ---
 
 *** mkfs ***
 
@@ -1444,15 +1660,231 @@ clean log
 *** mount ***
 
 
-*** mount failed: -ologbsize=32k ***
+*** ls SCRATCH_MNT ***
 
---- mkfs=-lversion=2,su=5120, mnt=-ologbsize=32k, sync=nosync ---
+00
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
 
-*** mkfs ***
+*** godown ***
+
+
+*** unmount ***
+
+
+*** logprint after going down... ***
+
+dirty log
 
+*** mount with replay ***
+
+
+*** ls SCRATCH_MNT ***
+
+00
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
 
-*** Cannot mkfs for this test using option specified: -lversion=2,su=5120 -lsize=2000b ***
+*** unmount ***
+
+
+*** logprint after mount and replay... ***
 
+clean log
 
-*** mkfs failed: -lversion=2,su=5120 ***
+*** filesystem is checked ok ***