Extra filtering as part of IRIX/Linux xfstests reconciliation for dump.

diff --git a/022.out b/022.out
index c3b80f6d2b3634f1b92c505873e44530b2d2b81c..02520424a19aed6001d6ea2247a402acbab3ef7d 100644 (file)
--- a/022.out
+++ b/022.out
@@ -8,7 +8,6 @@ fsstress : -f link=10 -f creat=10 -f mkdir=10 -f truncate=5 -f symlink=10
 Erasing tape
 Dumping to tape...
 xfsdump  -s DUMP_SUBDIR -f TAPE_DEV -M stress_tape_media -L stress_022 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -37,14 +36,13 @@ xfsdump: writing stream terminator
 xfsdump: beginning media stream terminator
 xfsdump: media file 2 (media 0, file 2)
 xfsdump: ending media stream terminator
-xfsdump: media stream terminator size 1048576 bytes
+xfsdump: media stream terminator size BLOCKSZ bytes
 xfsdump: dump size (non-dir files) : NUM bytes
 xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_022 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive

diff --git a/023.out b/023.out
index 8510305a33f14c247a2e475cd63879fcf6b55da2..f85fd4249e64e436182af9caac419a2ffaede957 100644 (file)
--- a/023.out
+++ b/023.out
@@ -5,7 +5,6 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -s DUMP_SUBDIR -f TAPE_DEV -M stress_tape_media -L stress_023 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -34,14 +33,13 @@ xfsdump: writing stream terminator
 xfsdump: beginning media stream terminator
 xfsdump: media file 2 (media 0, file 2)
 xfsdump: ending media stream terminator
-xfsdump: media stream terminator size 1048576 bytes
+xfsdump: media stream terminator size BLOCKSZ bytes
 xfsdump: dump size (non-dir files) : NUM bytes
 xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_023 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive

diff --git a/024.out b/024.out
index 2563ddd716edb55fc071340e14d7ac1cb78edd5c..537f95fa6d1b12c1b6696fde2176c0f261938e18 100644 (file)
--- a/024.out
+++ b/024.out
@@ -5,7 +5,6 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -l0 -f TAPE_DEV -M stress_tape_media -L stress_024 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -34,14 +33,13 @@ xfsdump: writing stream terminator
 xfsdump: beginning media stream terminator
 xfsdump: media file 2 (media 0, file 2)
 xfsdump: ending media stream terminator
-xfsdump: media stream terminator size 1048576 bytes
+xfsdump: media stream terminator size BLOCKSZ bytes
 xfsdump: dump size (non-dir files) : NUM bytes
 xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Erasing tape
 Dumping incrementally to tape...
 xfsdump  -l1 -f TAPE_DEV -M stress_tape_media -L stress_024 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 1 incremental dump of HOSTNAME:SCRATCH_MNT based on level 0 dump begun DATE
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -69,14 +67,13 @@ xfsdump: writing stream terminator
 xfsdump: beginning media stream terminator
 xfsdump: media file 2 (media 0, file 2)
 xfsdump: ending media stream terminator
-xfsdump: media stream terminator size 1048576 bytes
+xfsdump: media stream terminator size BLOCKSZ bytes
 xfsdump: dump size (non-dir files) : NUM bytes
 xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_024 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive

diff --git a/025.out b/025.out
index 257b874f349f69942143bc064054b6b0babc972e..15709c51d8d52ae5b436414fc5c98505190882dd 100644 (file)
--- a/025.out
+++ b/025.out
@@ -5,7 +5,6 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -m -b 1048576 -l0 -f TAPE_DEV -M stress_tape_media -L stress_025 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -36,7 +35,6 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -m -b 1048576 -f TAPE_DEV  -L stress_025 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive

diff --git a/026.out b/026.out
index 8e948e65dd348dbaf1c620fb994605da691ebcfa..4d71f8c1c2af31308018e74288bb7bf537d1b30a 100644 (file)
--- a/026.out
+++ b/026.out
@@ -3,7 +3,6 @@ Creating directory system to dump using src/fill.
 Setup ....................................
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L stress_026 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -27,7 +26,6 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Restoring from file...
 xfsrestore  -f DUMP_FILE  -L stress_026 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: examining media file 0

diff --git a/027.out b/027.out
index 33eec8200daf51b8dbcbd3df06eaec5a6542f501..fb1727faa9ae75171dd076c359369d1c50a11f60 100644 (file)
--- a/027.out
+++ b/027.out
@@ -3,7 +3,6 @@ Creating directory system to dump using src/fill.
 Setup ....................................
 xfsdump|xfsrestore ...
 xfsdump  -s DUMP_SUBDIR - SCRATCH_MNT | xfsrestore  - RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -23,7 +22,6 @@ xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed
 xfsrestore: Restore Status: SUCCESS
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID

diff --git a/028.out b/028.out
index 337127881840b6f5b44de39cafb2180fc5e86bd5..255bc5ccf3b7231d2635e9d59fe9138764be5dfe 100644 (file)
--- a/028.out
+++ b/028.out
@@ -1,7 +1,6 @@
 QA output created by 028
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.0 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -25,7 +24,6 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.1 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -48,7 +46,6 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.2 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -71,7 +68,6 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.3 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -94,7 +90,6 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.4 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID

diff --git a/035.out b/035.out
index 92c7f917a6c6168a1b8b95d4711ec42393ca1302..64a654e8573a36097d1c1926bd6bb9ebace60d78 100644 (file)
--- a/035.out
+++ b/035.out
@@ -5,7 +5,6 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -l0 -f TAPE_DEV -M stress_tape_media -L 035.1 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -34,7 +33,7 @@ xfsdump: writing stream terminator
 xfsdump: beginning media stream terminator
 xfsdump: media file 2 (media 0, file 2)
 xfsdump: ending media stream terminator
-xfsdump: media stream terminator size 1048576 bytes
+xfsdump: media stream terminator size BLOCKSZ bytes
 xfsdump: dump size (non-dir files) : NUM bytes
 xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
@@ -42,7 +41,6 @@ Creating directory system to dump using src/fill.
 Setup ....
 Dumping to tape...
 xfsdump  -l0 -f TAPE_DEV -M stress_tape_media -L 035.2 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -74,14 +72,13 @@ xfsdump: writing stream terminator
 xfsdump: beginning media stream terminator
 xfsdump: media file 2 (media 0, file 4)
 xfsdump: ending media stream terminator
-xfsdump: media stream terminator size 1048576 bytes
+xfsdump: media stream terminator size BLOCKSZ bytes
 xfsdump: dump size (non-dir files) : NUM bytes
 xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L 035.2 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive

diff --git a/036.out b/036.out
index cc0424b883fccbe82026e68e278705a8ee294056..81a649d32448f656ebca1678d8281c57d7b74ec5 100644 (file)
--- a/036.out
+++ b/036.out
@@ -4,7 +4,6 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -o -F -m -b 1048576 -l0 -f TAPE_DEV -M stress_tape_media -L stress_036 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -36,7 +35,6 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -m -b 1048576 -f TAPE_DEV  -L stress_036 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive

diff --git a/037.out b/037.out
index e572757c86dfee613953cc0ad7d76c33f04c39df..cb7f68215cb58c73e11fc352ffe19a1bf7a1533b 100644 (file)
--- a/037.out
+++ b/037.out
@@ -4,7 +4,6 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -o -F -m -b 1048576 -l0 -f TAPE_DEV -M stress_tape_media -L stress_037 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -36,7 +35,6 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -m -b 1048576 -f TAPE_DEV  -L stress_037 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive

diff --git a/038.out b/038.out
index 2777b7184b5b82d0bec4acc511673001e3a94f8c..a4669a12b1232d171cf4b15ee4c8ced5a5a18a55 100644 (file)
--- a/038.out
+++ b/038.out
@@ -4,7 +4,6 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -l0 -f TAPE_DEV -M stress_tape_media -L stress_038 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -40,7 +39,6 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_038 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive

diff --git a/039.out b/039.out
index e675991fb2ea4e3ca10d6cf44ec381e5ccf113c6..f39651e4ecb8b67f1bfb002f35ad51f4020d005b 100644 (file)
--- a/039.out
+++ b/039.out
@@ -4,7 +4,6 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -o -F -l0 -f TAPE_DEV -M stress_tape_media -L stress_039 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -41,7 +40,6 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_039 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive

diff --git a/043.out b/043.out
index 698e4e583c194164cdaa0604c226ed29f040bdc2..17b4b0aab6c02f6345f1069fc0e2f2f9fad71b2b 100644 (file)
--- a/043.out
+++ b/043.out
@@ -5,7 +5,6 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -s DUMP_SUBDIR -f TAPE_DEV -M stress_tape_media -L stress_043 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -34,14 +33,13 @@ xfsdump: writing stream terminator
 xfsdump: beginning media stream terminator
 xfsdump: media file 2 (media 0, file 2)
 xfsdump: ending media stream terminator
-xfsdump: media stream terminator size 1048576 bytes
+xfsdump: media stream terminator size BLOCKSZ bytes
 xfsdump: dump size (non-dir files) : NUM bytes
 xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_043 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: searching media for dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0

diff --git a/046.out b/046.out
index 159df78c933849eb8adecc0893ff6592dbc209db..0eb72ad440b43509e22474e655669249d424a7db 100644 (file)
--- a/046.out
+++ b/046.out
@@ -3,7 +3,6 @@ Creating directory system of symlinks to dump.
 Setup ....
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L stress_046 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -27,7 +26,6 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Restoring from file...
 xfsrestore  -f DUMP_FILE  -L stress_046 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: examining media file 0

diff --git a/047.out b/047.out
index 7c2ac733ee248e0431385148974be7c86569bb3c..783c0a0b22ca8f9a8a02d91296f66e841fadb41c 100644 (file)
--- a/047.out
+++ b/047.out
@@ -1,7 +1,6 @@
 QA output created by 047
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.0 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -25,7 +24,6 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.1 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -48,7 +46,6 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.2 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -71,7 +68,6 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.3 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -94,7 +90,6 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.4 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID

diff --git a/055.out b/055.out
index d594a11755bb47f5a0558914f6a13586f3f00ee7..053ff2212e3a11069c056d4e2049146758afe1fc 100644 (file)
--- a/055.out
+++ b/055.out
@@ -4,7 +4,6 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -o -F -l0 -f TAPE_DEV -M stress_tape_media -L stress_055 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -41,7 +40,6 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_055 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive

diff --git a/056.out b/056.out
index 53a801866fdf0b99d643887ffef715f1d2a7cb54..85c1946b9142cb27d470e82246a0eb1f4af759bc 100644 (file)
--- a/056.out
+++ b/056.out
@@ -3,7 +3,6 @@ Creating directory system to dump using src/fill.
 Setup ..........
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L stress_056 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -27,7 +26,6 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Restoring from file...
 xfsrestore  -f DUMP_FILE  -L stress_056 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: examining media file 0

diff --git a/061.out b/061.out
index 45ed0a82ca669a81514314d400babdfa7f5178c9..4638b46c82d2cd918f78cf7f0281d3ff844093f5 100644 (file)
--- a/061.out
+++ b/061.out
@@ -3,7 +3,6 @@ Creating directory system to dump using src/fill.
 Setup ..........
 Restoring from file...
 xfsrestore  -f DUMP_FILE  -L stress_056 RESTORE_DIR
-xfsrestore: version 3.0 - Running single-threaded
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: found dump matching specified label:

diff --git a/common.dump b/common.dump
index fd305fd5f6e9e536bf6646bf1d2fcc55ef3d259f..3962c30d935f5246fbdc0c95696e42ab55d24bf4 100644 (file)
--- a/common.dump
+++ b/common.dump
@@ -44,21 +44,23 @@ if [ -n "$DEBUGDUMP" ]; then
 fi
  
 # Use dump/restore in qa directory for debugging
-#PATH=".:$PATH"
-#export PATH
+PATH=".:$PATH"
+export PATH
 #which xfsdump
 #which xfsrestore
+#which xfsinvutil
 
 # status returned for not run tests
 NOTRUNSTS=2
 
 # name those directories
 dump_file=$tmp.dumpfile
+# dump_file=$here/dumpfile #TEMP OVERRIDE DUMP FILE
 dump_sdir=dumpdir
 dump_dir=$SCRATCH_MNT/$dump_sdir
 restore_sdir=restoredir
 restore_dir=$SCRATCH_MNT/$restore_sdir
-
+multi=3
 dumptape=$TAPE_DEV
 media_label="stress_tape_media"
 session_label="stress_$seq"
@@ -79,6 +81,16 @@ for dir in /var/xfsdump/inventory /var/lib/xfsdump/inventory; do
     fi
 done
 
+# remove this when xfstests irix/linux port done
+if [ "X$XFS_HOST_OS" = "Xirix" ]
+then # IRIX
+    have_mtvariable=false
+    MKFS_OPTS=""
+else # Linux
+    have_mtvariable=true
+    MKFS_OPTS="-f"
+fi
+
 
 #
 # do a remote/local mt
@@ -198,6 +210,8 @@ _isrmt()
 #
 _set_variable()
 {
+    $have_mtvariable || return
+
     if _isrmt; then
        :
     else
@@ -234,7 +248,7 @@ _wipe_fs()
 {
     _require_scratch
 
-    mkfs -t xfs -f $SCRATCH_DEV >>$seq.full  ||\
+    mkfs -t xfs $MKFS_OPTS $SCRATCH_DEV>>$seq.full  ||\
        _error "mkfs failed"
       
     mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full ||\
@@ -254,7 +268,7 @@ _cleanup()
        # save it for inspection
        for dir in /var/xfsdump/inventory /var/lib/xfsdump/inventory; do
            [ -d $dir ] || continue
-           tar -zcvf $seq.inventory.tgz $dir
+           tar -cvf $seq.inventory.tar $dir
            ls -lR $dir >$seq.inventory.ls
        done
     fi
@@ -275,6 +289,11 @@ _cleanup()
     fi
 }
 
+#
+# ensure that bulkstat data will
+# match with incore data
+# by forcing disk data to be written out
+#
 _stable_fs()
 {
     umount $SCRATCH_MNT >>$seq.full ||\
@@ -307,7 +326,7 @@ _create_dumpdir_stress()
     echo "-----------------------------------------------"
     echo "fsstress : $_param"
     echo "-----------------------------------------------"
-    if ! $here/src/fsstress $_param $FSSTRESS_AVOID -n $_count -d $dump_dir >$tmp.out 2>&1
+    if ! $here/src/fsstress $_param -s 1 $FSSTRESS_AVOID -n $_count -d $dump_dir >$tmp.out 2>&1
     then
         echo "    fsstress (count=$_count) returned $? - see $seq.full"
         
@@ -400,6 +419,40 @@ dir_mix2   d       $nobody $nobody 642
 End-of-File
 }
 
+_mk_fillconfig_ea()
+{
+    cat <<End-of-File >$tmp.config
+# pathname     size    user    group    perm   name value
+#
+smalll         10      $nobody $nobody  777    attr1 some_text    
+biggg          102400  $nobody $nobody  777    attr2 some_text2
+sub/smalll     10      $nobody $nobody  777    attr3 some_text3
+sub/biggg      102400  $nobody $nobody  777    attr4 some_text4
+dir            d       $nobody $nobody  777    attr5 dir_text
+#
+# Add more files so that there are more than the number
+# of streams.
+# There are bugs in dump/restore for # non-dir files < # streams
+# It can be tested in another configuration.
+# It is a pathalogical case.
+#
+sub/a          1       $nobody $nobody
+sub/b          2       $nobody $nobody
+sub/c          4       $nobody $nobody
+sub/d          8       $nobody $nobody
+sub/e          16      $nobody $nobody
+sub/f          32      $nobody $nobody
+sub/g          64      $nobody $nobody
+sub/h          128     $nobody $nobody
+sub/i          256     $nobody $nobody
+sub/j          512     $nobody $nobody
+sub/k          1024    $nobody $nobody
+sub/l          2048    $nobody $nobody
+sub/m          4096    $nobody $nobody
+sub/n          8192    $nobody $nobody
+End-of-File
+}
+
 #
 # Create a bunch of directories/files of different sizes
 # filled with data.
@@ -421,7 +474,7 @@ _do_create_dumpdir_fill()
 
     $verbose && echo -n "Setup "
     sed -e '/^#/d' $tmp.config \
-    | while read file nbytes owner group perms
+    | while read file nbytes owner group perms ea_name ea_value
     do
        if [ $nbytes = "d" ]; then
            # create a directory
@@ -470,6 +523,9 @@ _do_create_dumpdir_fill()
        if [ -n "$perms" ]; then
            chmod $perms $file
        fi
+       if [ -n "$ea_name" -a -n "$ea_value" ]; then
+           attr -s $ea_name -V $ea_value $file
+       fi
        $verbose && echo -n "."
     done
     $verbose && echo
@@ -502,6 +558,13 @@ _create_dumpdir_fill_perm()
     _stable_fs
 }      
 
+_create_dumpdir_fill_ea()
+{
+    _wipe_fs
+    _mk_fillconfig_ea
+    _do_create_dumpdir_fill
+    _stable_fs
+}      
 
 
 #
@@ -617,11 +680,13 @@ _create_dumpdir_symlinks()
 
 #
 # Filter for ls
-# Filter out dates on symlinks
+# Filter out dates on symlinks and char devices
 #
 _ls_filter()
 {
-  $AWK_PROG '/^l/ { date = $8; sub(date,"DATE"); print}
+  $AWK_PROG '
+        /^l/ { date = $8; sub(date,"DATE"); print}
+        /^c/ { date = $9; sub(date,"DATE"); print}
         {print}' \
   | sed -e 's/total [0-9][0-9]*/total TOTAL/'
 }
@@ -636,6 +701,7 @@ _dump_filter_main()
   sed \
       -e "s/`hostname`/HOSTNAME/"   \
       -e "s#$SCRATCH_DEV#SCRATCH_DEV#"    \
+      -e "s#$SCRATCH_RAWDEV#SCRATCH_DEV#"    \
       -e "s#$dumptape#TAPE_DEV#"    \
       -e "s#$SCRATCH_MNT#SCRATCH_MNT#"    \
       -e "s#$dump_file#DUMP_FILE#"  \
@@ -644,25 +710,38 @@ _dump_filter_main()
       -e 's/date:[     ].*/date: DATE/'       \
       -e 's/dump begun .*/dump begun DATE/'    \
       -e 's/[0-9][0-9]* seconds/SECS seconds/' \
+      -e 's/restore.[0-9][0-9]*/restore.PID/' \
       -e 's/ino [0-9][0-9]*/ino INO/' \
       -e '/: dump size/s/[0-9][0-9]*/NUM/'     \
       -e '/dump size:/s/[0-9][0-9]*/NUM/'      \
-      -e '/media file size/s/[0-9][0-9]*/NUM/' \
-      -e '/mfile size:[         ]*/s/[0-9][0-9]*/NUM/' \
+      -e '/dump size per stream:/s/[0-9][0-9]*/NUM/' \
+      -e 's/\(media file size[  ]*\)[0-9][0-9]*/\1NUM/' \
+      -e 's/\(mfile size:[      ]*\)[0-9][0-9]*/\1NUM/' \
+      -e '/drive[       ]*[0-9][0-9]*:/d' \
       -e '/\/dev\/tty/d' \
       -e '/inventory session uuid/d' \
-      -e 's#/var/lib/xfsdump#/var/xfsdump#' \
-
+      -e '/ - Running single-threaded/d' \
+      -e '/^.*I\/O metrics: .*$/d' \
+      -e 's/1048576/BLOCKSZ/' \
+      -e 's/2097152/BLOCKSZ/' \
+      -e 's/(pid[       ]*[1-9][0-9]*)/\(pid PID\)/' \
+  | perl -ne '
+      if ($_ =~ /(?:Dump|Restore) Summary/) {
+        $skip = 1;
+      } elsif ($_ =~ /(?:Dump|Restore) Status/) {
+        $skip = 0;
+      }
+      print if (! $skip);'
 }
 
 _dump_filter()
 {
-  if $do_quota_check
-  then
-      _dump_filter_main | _check_quota_dumprestore
-  else
-      _dump_filter_main
-  fi
+   if $do_quota_check
+   then
+       _dump_filter_main | _check_quota_dumprestore
+   else
+       _dump_filter_main
+   fi
 }
 
 _invutil_filter()
@@ -676,17 +755,20 @@ _invutil_filter()
 
 }
 
+
 _dir_filter()
 {
   sed \
     -e "s#$dump_file#DUMP_FILE#"      \
     -e "s#$SCRATCH_DEV#SCRATCH_DEV#"        \
+    -e "s#$SCRATCH_RAWDEV#SCRATCH_DEV#"    \
     -e "s#$dumptape#TAPE_DEV#"         \
     -e "s#$dump_dir#DUMP_DIR#g"       \
     -e "s#$restore_dir#RESTORE_DIR#g" \
     -e "s#$SCRATCH_MNT#SCRATCH_MNT#g"       \
     -e "s#$dump_sdir#DUMP_SUBDIR#g"   \
     -e "s#$restore_sdir#RESTORE_SUBDIR#g" \
+    -e "s#$$#PID#g" \
 
 }
 
@@ -694,34 +776,41 @@ _parse_args()
 {
     OPTIND=0
     dump_args=""
-    while getopts "f:FL:oqQ" c $*
+    while [ $# -gt 0 ]
     do
-        case $c
+        case $1
         in
-        f)
-            [ -z "$OPTARG" ] && _error "missing argument for -f"
-           dumptape=$OPTARG    
+        -f)
+            [ -z "$2" ] && _error "missing argument for -f"
+           dumptape=$2 
+           shift
             ;;
-        L)
-            [ -z "$OPTARG" ] && _error "missing argument for -L"
-           session_label=$OPTARG       
+        -L)
+            [ -z "$2" ] && _error "missing argument for -L"
+           session_label=$2
+           shift
             ;;
-       o)
+       -o)
            dump_args="$dump_args -o"
             ;;
-       F)
+       -F)
            dump_args="$dump_args -F"
             ;;
-       q)
-           do_quota_check=true
+       --multi)
+           multi=$2
+           shift
+           ;;
+        -q)
+            do_quota_check=true
             ;;
-       Q)
-           do_quota_check=false
+        -Q)
+            do_quota_check=false
             ;;
-       \?)
+       *)
             _error "invalid argument"
             ;;
         esac
+       shift
     done
 }
 
@@ -793,6 +882,28 @@ _do_dump_file()
     xfsdump $opts 2>&1 | tee -a $seq.full | _dump_filter
 }
 
+#
+# Do full dump to multiple files
+#
+_do_dump_multi_file()
+{
+    _parse_args "$@"
+
+    multi_args=""
+
+    i=0
+    while [ $i -lt $multi ]
+    do
+       multi_args="$multi_args -f $dump_file.$i -M $media_label.$i"
+       i=`expr $i + 1`
+    done
+
+    echo "Dumping to files..."
+    opts="$_dump_debug$dump_args $multi_args -L $session_label $SCRATCH_MNT"
+    echo "xfsdump $opts" | _dir_filter  
+    xfsdump $opts 2>&1 | tee -a $seq.full | _dump_filter
+}
+
 
 _prepare_restore_dir()
 {
@@ -860,6 +971,29 @@ _do_restore_file()
     xfsrestore $opts 2>&1 | tee -a $seq.full | _dump_filter
 }
 
+#
+# Restore the tape from multiple dump files
+#
+_do_restore_multi_file()
+{
+    _parse_args "$@"
+    _prepare_restore_dir
+
+    multi_args=""
+
+    i=0
+    while [ $i -lt $multi ]
+    do
+       multi_args="$multi_args -f $dump_file.$i"
+       i=`expr $i + 1`
+    done
+
+    echo "Restoring from file..."
+    opts="$_restore_debug$dump_args $multi_args -L $session_label $restore_dir"
+    echo "xfsrestore $opts" | _dir_filter  
+    xfsrestore $opts 2>&1 | tee -a $seq.full | _dump_filter
+}
+
 #
 # Do xfsdump piped into xfsrestore - xfsdump | xfsrestore
 #
@@ -919,7 +1053,6 @@ _ls_nodate_compare_sub()
     diff -cs $tmp.dump_dir $tmp.restore_dir | sed -e "s#$tmp#TMP#g"
 }
 
-
 #
 # Compare using recursive diff the files of the dumped
 # subdirectory.
@@ -928,9 +1061,44 @@ _ls_nodate_compare_sub()
 _diff_compare_sub()
 {
     echo "Comparing dump directory with restore directory"
-    diff -rs $dump_dir $restore_dir/$dump_sdir | _dir_filter
+    diff -rs $dump_dir $restore_dir/$dump_sdir | _dir_filter | _check_quota_diff
+}
+
+_get_eas_on_path()
+{
+    _path=$1
+
+    find $_path -exec attr -l {} \; |\
+    awk '{print $9, $2}' |\
+    sed 's/["]//g' |\
+    while read file ea_name; do
+       attr -g $ea_name $file
+    done
+}
+
+#
+# Compare the extended attributes of the files/dirs
+# b/w the dumped and restore dirs.
+#
+#
+# Attribute "attr5" had a 8 byte value for /spare1/dump.5460/dir:
+# Attribute "attr5" had a 8 byte value for /spare1/restore.5460/dump.5460/dir:
+#
+_diff_compare_eas()
+{
+    echo "Comparing dump directory with restore directory"
+    echo "Looking at the extended attributes (EAs)"
+    echo "EAs on dump"
+    _get_eas_on_path $dump_dir | tee $seq.ea1 | _dir_filter
+    echo "EAs on restore"
+    _get_eas_on_path $restore_dir/$dump_sdir \
+    | sed -e "s#$restore_sdir\/##" \
+    | tee $seq.ea2 \
+    | _dir_filter
+    diff -s $seq.ea1 $seq.ea2
 }
 
+
 #
 # Compare using recursive diff the files of the dumped
 # filesystem
@@ -957,7 +1125,7 @@ _do_invutil()
 {
     host=`hostname`
     echo "xfsinvutil $_invutil_debug -M $host:$SCRATCH_MNT \"$middate\" $*" >$seq.full
-    xfsinvutil $_invutil_debug -M $host:$SCRATCH_MNT "$middate" $* \
+    xfsinvutil $_invutil_debug $* -M $host:$SCRATCH_MNT "$middate" \
     | tee -a $seq.full | _invutil_filter
 }