Update for message about the number of entries processed.

diff --git a/022.out b/022.out
index 02520424a19aed6001d6ea2247a402acbab3ef7d..91668f632ee508f28c67d48f66e8ecb4a1df99af 100644 (file)
--- a/022.out
+++ b/022.out
@@ -8,6 +8,7 @@ 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: using scsi tape (drive_scsitape) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -43,11 +44,13 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_022 RESTORE_DIR
+xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 28 directories and 91 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/023.out b/023.out
index f85fd4249e64e436182af9caac419a2ffaede957..181f24a52d7d621dccee40b2f905da57081b1fa5 100644 (file)
--- a/023.out
+++ b/023.out
@@ -5,6 +5,7 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -s DUMP_SUBDIR -f TAPE_DEV -M stress_tape_media -L stress_023 SCRATCH_MNT
+xfsdump: using scsi tape (drive_scsitape) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -40,11 +41,13 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_023 RESTORE_DIR
+xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 3 directories and 38 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/024.out b/024.out
index 56140bfd71897f3cdb2e0b8a377eb7d2bfcdcbac..c4cd039d9dc2d9964e1fcec426c5b0a07706e10e 100644 (file)
--- a/024.out
+++ b/024.out
@@ -5,6 +5,7 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -f TAPE_DEV -M stress_tape_media -L stress_024 SCRATCH_MNT
+xfsdump: using scsi tape (drive_scsitape) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -40,6 +41,7 @@ xfsdump: Dump Status: SUCCESS
 Erasing tape
 Dumping to tape...
 xfsdump  -l1 -f TAPE_DEV -M stress_tape_media -L stress_024 SCRATCH_MNT
+xfsdump: using scsi tape (drive_scsitape) strategy
 xfsdump: level 1 incremental dump of HOSTNAME:SCRATCH_MNT based on level 0 dump begun DATE
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -74,11 +76,13 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_024 RESTORE_DIR
+xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 3 directories and 38 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/025.out b/025.out
index 15709c51d8d52ae5b436414fc5c98505190882dd..4d6515db3c6d2a414302fedf7f58b28b3b012ce9 100644 (file)
--- a/025.out
+++ b/025.out
@@ -5,6 +5,7 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -m -b 1048576 -l0 -f TAPE_DEV -M stress_tape_media -L stress_025 SCRATCH_MNT
+xfsdump: using minimum scsi tape (drive_minrmt) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -35,11 +36,13 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -m -b 1048576 -f TAPE_DEV  -L stress_025 RESTORE_DIR
+xfsrestore: using minimum scsi tape (drive_minrmt) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 3 directories and 38 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/026.out b/026.out
index 4d71f8c1c2af31308018e74288bb7bf537d1b30a..9f06c0bf390c9dd5bc8114a05069d5831319968c 100644 (file)
--- a/026.out
+++ b/026.out
@@ -3,6 +3,7 @@ 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: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -26,10 +27,12 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Restoring from file...
 xfsrestore  -f DUMP_FILE  -L stress_026 RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 3 directories and 38 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/027.out b/027.out
index fb1727faa9ae75171dd076c359369d1c50a11f60..da6cb2f687d82018d75ff926a356894dadf6165f 100644 (file)
--- a/027.out
+++ b/027.out
@@ -3,6 +3,7 @@ Creating directory system to dump using src/fill.
 Setup ....................................
 xfsdump|xfsrestore ...
 xfsdump  -s DUMP_SUBDIR - SCRATCH_MNT | xfsrestore  - RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -18,10 +19,12 @@ xfsrestore: session id: ID
 xfsrestore: media id: ID
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 3 directories and 39 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed
 xfsrestore: Restore Status: SUCCESS
+xfsdump: using file dump (drive_simple) strategy
 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 255bc5ccf3b7231d2635e9d59fe9138764be5dfe..da84d24dac574b79970b11c14f6801a914b16a03 100644 (file)
--- a/028.out
+++ b/028.out
@@ -1,6 +1,7 @@
 QA output created by 028
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.0 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -24,6 +25,7 @@ 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: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -46,6 +48,7 @@ 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: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -68,6 +71,7 @@ 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: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -90,6 +94,7 @@ 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: using file dump (drive_simple) strategy
 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 2bbfea25b6d84e572ada38633739b705dec97bdc..77ad736dd68c2b731df45d65d5a80040c1055dfa 100644 (file)
--- a/035.out
+++ b/035.out
@@ -5,6 +5,7 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -f TAPE_DEV -M stress_tape_media -L 035.1 SCRATCH_MNT
+xfsdump: using scsi tape (drive_scsitape) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -41,6 +42,7 @@ Creating directory system to dump using src/fill.
 Setup ....
 Dumping to tape...
 xfsdump  -f TAPE_DEV -M stress_tape_media -L 035.2 SCRATCH_MNT
+xfsdump: using scsi tape (drive_scsitape) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -79,6 +81,7 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L 035.2 RESTORE_DIR
+xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
@@ -86,6 +89,7 @@ xfsrestore: examining media file 0
 xfsrestore: examining media file 1
 xfsrestore: examining media file 2
 xfsrestore: reading directories
+xfsrestore: 3 directories and 6 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/036.out b/036.out
index 81a649d32448f656ebca1678d8281c57d7b74ec5..8f7473a034dd462d21d92882436da4fbfd20ac38 100644 (file)
--- a/036.out
+++ b/036.out
@@ -4,6 +4,7 @@ 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: using minimum scsi tape (drive_minrmt) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -35,11 +36,13 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -m -b 1048576 -f TAPE_DEV  -L stress_036 RESTORE_DIR
+xfsrestore: using minimum scsi tape (drive_minrmt) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 3 directories and 38 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/037.out b/037.out
index cb7f68215cb58c73e11fc352ffe19a1bf7a1533b..91ab75d59803614f1a8e15e714d749bb9adf2617 100644 (file)
--- a/037.out
+++ b/037.out
@@ -4,6 +4,7 @@ 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: using minimum scsi tape (drive_minrmt) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -35,11 +36,13 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -m -b 1048576 -f TAPE_DEV  -L stress_037 RESTORE_DIR
+xfsrestore: using minimum scsi tape (drive_minrmt) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 3 directories and 38 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/038.out b/038.out
index 918ec33761befcfe22d6406d23c96e1f065120a8..5f8b9fa244d4e6599bde1f9c5400f31ca6db7b2d 100644 (file)
--- a/038.out
+++ b/038.out
@@ -4,6 +4,7 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -f TAPE_DEV -M stress_tape_media -L stress_038 SCRATCH_MNT
+xfsdump: using scsi tape (drive_scsitape) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -39,11 +40,13 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_038 RESTORE_DIR
+xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 3 directories and 38 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/039.out b/039.out
index 09e8cb6b0797107857cf83688a66120df254cd11..b537985815529121be1ed24bc8641c96362ede2d 100644 (file)
--- a/039.out
+++ b/039.out
@@ -4,6 +4,7 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -o -F -f TAPE_DEV -M stress_tape_media -L stress_039 SCRATCH_MNT
+xfsdump: using scsi tape (drive_scsitape) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -40,11 +41,13 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_039 RESTORE_DIR
+xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 3 directories and 38 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/043.out b/043.out
index 17b4b0aab6c02f6345f1069fc0e2f2f9fad71b2b..2c62d6879db367898c4e23113725dff4a767671e 100644 (file)
--- a/043.out
+++ b/043.out
@@ -5,6 +5,7 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -s DUMP_SUBDIR -f TAPE_DEV -M stress_tape_media -L stress_043 SCRATCH_MNT
+xfsdump: using scsi tape (drive_scsitape) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -40,6 +41,7 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_043 RESTORE_DIR
+xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: searching media for dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
@@ -56,6 +58,7 @@ xfsrestore: session id: ID
 xfsrestore: media id: ID
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 3 directories and 38 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: examining media file 1

diff --git a/046.out b/046.out
index 0eb72ad440b43509e22474e655669249d424a7db..9b4725b7528286ca851cb4358b76cb365f20071e 100644 (file)
--- a/046.out
+++ b/046.out
@@ -3,6 +3,7 @@ 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: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -26,10 +27,12 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Restoring from file...
 xfsrestore  -f DUMP_FILE  -L stress_046 RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 3 directories and 10 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/047.out b/047.out
index 783c0a0b22ca8f9a8a02d91296f66e841fadb41c..e19510b418d88bcc9cc8a1662bb92ba52cf82e0d 100644 (file)
--- a/047.out
+++ b/047.out
@@ -1,6 +1,7 @@
 QA output created by 047
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L session.0 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -24,6 +25,7 @@ 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: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -46,6 +48,7 @@ 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: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -68,6 +71,7 @@ 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: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -90,6 +94,7 @@ 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: using file dump (drive_simple) strategy
 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 7ddee1fe96d457528a91ba11919b955c6a763f44..f09dd2e47ac2160b8fea37cc8aa1dd6b17784d5e 100644 (file)
--- a/055.out
+++ b/055.out
@@ -4,6 +4,7 @@ Setup ....................................
 Erasing tape
 Dumping to tape...
 xfsdump  -o -F -f TAPE_DEV -M stress_tape_media -L stress_055 SCRATCH_MNT
+xfsdump: using scsi tape (drive_scsitape) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -40,11 +41,13 @@ xfsdump: Dump Status: SUCCESS
 Rewinding tape
 Restoring from tape...
 xfsrestore  -f TAPE_DEV  -L stress_055 RESTORE_DIR
+xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 3 directories and 38 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/056.out b/056.out
index 85c1946b9142cb27d470e82246a0eb1f4af759bc..fc150d0e74ef4d3b475d62e314a60edcc6767827 100644 (file)
--- a/056.out
+++ b/056.out
@@ -3,6 +3,7 @@ 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: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -26,10 +27,12 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Restoring from file...
 xfsrestore  -f DUMP_FILE  -L stress_056 RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 7 directories and 11 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/061.out b/061.out
index 4638b46c82d2cd918f78cf7f0281d3ff844093f5..be3f3822fd053a4749f46a82cab7a4d0d9e23502 100644 (file)
--- a/061.out
+++ b/061.out
@@ -3,6 +3,7 @@ Creating directory system to dump using src/fill.
 Setup ..........
 Restoring from file...
 xfsrestore  -f DUMP_FILE  -L stress_056 RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: found dump matching specified label:
@@ -18,6 +19,7 @@ xfsrestore: session id: ID
 xfsrestore: media id: ID
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 7 directories and 11 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/063.out b/063.out
index 5408b4bcb7ff96900b097a341571d1540961574b..eed2257ba6f3497d878ce0caebdca0f385356614 100644 (file)
--- a/063.out
+++ b/063.out
@@ -13,6 +13,7 @@ dir_text
 ...............
 Dumping to file...
 xfsdump  -f DUMP_FILE -M stress_tape_media -L stress_063 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -36,10 +37,12 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Restoring from file...
 xfsrestore  -f DUMP_FILE  -L stress_063 RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: examining media file 0
 xfsrestore: reading directories
+xfsrestore: 4 directories and 21 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/064.out b/064.out
index 9437994eb5a484af9e01b9d7e4d00a732d7e566b..d089179a7c2d365665a0646382273a6e7f9004c2 100644 (file)
--- a/064.out
+++ b/064.out
@@ -48,6 +48,7 @@ creating hardlink file9_h5 to file9
 Do the incremental dumps
 Dumping to file...
 xfsdump  -l0 -f DUMP_FILE -M stress_tape_media -L stress_064 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -71,6 +72,7 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -l1 -f DUMP_FILE -M stress_tape_media -L stress_064 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 1 incremental dump of HOSTNAME:SCRATCH_MNT based on level 0 dump begun DATE
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -93,6 +95,7 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -l2 -f DUMP_FILE -M stress_tape_media -L stress_064 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 2 incremental dump of HOSTNAME:SCRATCH_MNT based on level 1 dump begun DATE
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -115,6 +118,7 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -l3 -f DUMP_FILE -M stress_tape_media -L stress_064 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 3 incremental dump of HOSTNAME:SCRATCH_MNT based on level 2 dump begun DATE
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -137,6 +141,7 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -l4 -f DUMP_FILE -M stress_tape_media -L stress_064 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 4 incremental dump of HOSTNAME:SCRATCH_MNT based on level 3 dump begun DATE
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -159,6 +164,7 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -l5 -f DUMP_FILE -M stress_tape_media -L stress_064 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 5 incremental dump of HOSTNAME:SCRATCH_MNT based on level 4 dump begun DATE
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -181,6 +187,7 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -l6 -f DUMP_FILE -M stress_tape_media -L stress_064 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 6 incremental dump of HOSTNAME:SCRATCH_MNT based on level 5 dump begun DATE
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -203,6 +210,7 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -l7 -f DUMP_FILE -M stress_tape_media -L stress_064 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 7 incremental dump of HOSTNAME:SCRATCH_MNT based on level 6 dump begun DATE
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -225,6 +233,7 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -l8 -f DUMP_FILE -M stress_tape_media -L stress_064 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 8 incremental dump of HOSTNAME:SCRATCH_MNT based on level 7 dump begun DATE
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -247,6 +256,7 @@ xfsdump: dump complete: SECS seconds elapsed
 xfsdump: Dump Status: SUCCESS
 Dumping to file...
 xfsdump  -l9 -f DUMP_FILE -M stress_tape_media -L stress_064 SCRATCH_MNT
+xfsdump: using file dump (drive_simple) strategy
 xfsdump: level 9 incremental dump of HOSTNAME:SCRATCH_MNT based on level 8 dump begun DATE
 xfsdump: dump date: DATE
 xfsdump: session id: ID
@@ -327,6 +337,7 @@ Look at what files are contained in the inc. dump
 restoring from df.level0
 Contents of dump ...
 xfsrestore  -f DUMP_FILE -t
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -343,6 +354,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: reading non-directory files
 xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -406,6 +418,7 @@ dumpdir/file9_h5
 restoring from df.level1
 Contents of dump ...
 xfsrestore  -f DUMP_FILE -t
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -422,6 +435,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: reading non-directory files
 xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -437,6 +451,7 @@ dumpdir/file1_h5
 restoring from df.level2
 Contents of dump ...
 xfsrestore  -f DUMP_FILE -t
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -453,6 +468,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: reading non-directory files
 xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -468,6 +484,7 @@ dumpdir/file2_h5
 restoring from df.level3
 Contents of dump ...
 xfsrestore  -f DUMP_FILE -t
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -484,6 +501,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: reading non-directory files
 xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -499,6 +517,7 @@ dumpdir/file3_h5
 restoring from df.level4
 Contents of dump ...
 xfsrestore  -f DUMP_FILE -t
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -515,6 +534,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: reading non-directory files
 xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -530,6 +550,7 @@ dumpdir/file4_h5
 restoring from df.level5
 Contents of dump ...
 xfsrestore  -f DUMP_FILE -t
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -546,6 +567,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: reading non-directory files
 xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -561,6 +583,7 @@ dumpdir/file5_h5
 restoring from df.level6
 Contents of dump ...
 xfsrestore  -f DUMP_FILE -t
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -577,6 +600,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: reading non-directory files
 xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -592,6 +616,7 @@ dumpdir/file6_h5
 restoring from df.level7
 Contents of dump ...
 xfsrestore  -f DUMP_FILE -t
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -608,6 +633,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: reading non-directory files
 xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -623,6 +649,7 @@ dumpdir/file7_h5
 restoring from df.level8
 Contents of dump ...
 xfsrestore  -f DUMP_FILE -t
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -639,6 +666,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: reading non-directory files
 xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -654,6 +682,7 @@ dumpdir/file8_h5
 restoring from df.level9
 Contents of dump ...
 xfsrestore  -f DUMP_FILE -t
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -670,6 +699,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: reading non-directory files
 xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -686,6 +716,7 @@ Do the cumulative restores
 restoring from df.level0
 Restoring cumumlative from file...
 xfsrestore  -f DUMP_FILE -r RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -702,6 +733,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed
@@ -765,6 +797,7 @@ ls -l restore_dir
 restoring from df.level1
 Restoring cumumlative from file...
 xfsrestore  -f DUMP_FILE -r RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -781,6 +814,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed
@@ -844,6 +878,7 @@ ls -l restore_dir
 restoring from df.level2
 Restoring cumumlative from file...
 xfsrestore  -f DUMP_FILE -r RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -860,6 +895,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed
@@ -923,6 +959,7 @@ ls -l restore_dir
 restoring from df.level3
 Restoring cumumlative from file...
 xfsrestore  -f DUMP_FILE -r RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -939,6 +976,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed
@@ -1002,6 +1040,7 @@ ls -l restore_dir
 restoring from df.level4
 Restoring cumumlative from file...
 xfsrestore  -f DUMP_FILE -r RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -1018,6 +1057,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed
@@ -1081,6 +1121,7 @@ ls -l restore_dir
 restoring from df.level5
 Restoring cumumlative from file...
 xfsrestore  -f DUMP_FILE -r RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -1097,6 +1138,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed
@@ -1160,6 +1202,7 @@ ls -l restore_dir
 restoring from df.level6
 Restoring cumumlative from file...
 xfsrestore  -f DUMP_FILE -r RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -1176,6 +1219,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed
@@ -1239,6 +1283,7 @@ ls -l restore_dir
 restoring from df.level7
 Restoring cumumlative from file...
 xfsrestore  -f DUMP_FILE -r RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -1255,6 +1300,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed
@@ -1318,6 +1364,7 @@ ls -l restore_dir
 restoring from df.level8
 Restoring cumumlative from file...
 xfsrestore  -f DUMP_FILE -r RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -1334,6 +1381,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed
@@ -1397,6 +1445,7 @@ ls -l restore_dir
 restoring from df.level9
 Restoring cumumlative from file...
 xfsrestore  -f DUMP_FILE -r RESTORE_DIR
+xfsrestore: using file dump (drive_simple) strategy
 xfsrestore: searching media for dump
 xfsrestore: examining media file 0
 xfsrestore: dump description: 
@@ -1413,6 +1462,7 @@ xfsrestore: media id: ID
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: reading directories
+xfsrestore: 2 directories and 55 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/common.dump b/common.dump
index f9add3eb7d7a9c43db24867386eb2094f6635244..4f89b6f59d0847c4a51a83d64d1e435a6660b3ce 100644 (file)
--- a/common.dump
+++ b/common.dump
@@ -787,7 +787,7 @@ _dump_filter()
 {
    if $do_quota_check
    then
-       _dump_filter_main | _check_quota_dumprestore
+       _dump_filter_main | _check_quota_dumprestore | _check_quota_entries
    else
        _dump_filter_main
    fi
@@ -1038,6 +1038,7 @@ _do_restore_toc()
     cd $SCRATCH_MNT # for IRIX which needs xfs cwd
     xfsrestore $opts 2>&1 | tee -a $seq.full | _dump_filter_main |\
     _check_quota_file |\
+    _check_quota_entries |\
     $AWK_PROG 'NF != 1 { print; next }
               {files = sprintf("%s\n%s", files, $1)}
                END { print files | "sort" } '
@@ -1248,6 +1249,25 @@ _check_quota()
     '
 }
 
+#
+# xfsrestore: 3 directories and 40 entries processed 
+#   $5 = 40 
+#   num entries needs to be reduced by num quota file(s) 
+#
+_check_quota_entries()
+{
+    uquota=0
+    gquota=0 
+    $here/src/feature -U $SCRATCH_DEV && uquota=1
+    $here/src/feature -G $SCRATCH_DEV && gquota=1
+    $AWK_PROG -v uquota=$uquota -v gquota=$gquota '
+       /entries processed/ { 
+               if (uquota) $5--
+               if (gquota) $5--
+       }
+       {print}'
+}
+
 #
 # Look for:
 # xfsdump: saving user quota information for: SCRATCH_MNT