A recent mod changed the number of phases in xfsdump, and consequently the

xfsdump output changed. This mod fixes the expected output for the xfsdump
tests, as well as a few other minor bugs I came across when running the
xfsdump qa tests.

diff --git a/022.out.irix b/022.out.irix
index 354b8864a0e440dadf5e998d482abbc02e1997d8..48fb389925806433f4238a2607cb2b3340a6ddda 100644 (file)
--- a/022.out.irix
+++ b/022.out.irix
@@ -12,11 +12,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_022"
-xfsdump: ino map phase 1: parsing subtree selections
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -50,7 +48,7 @@ xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
-xfsrestore: 28 directories and 100 entries processed
+xfsrestore: 30 directories and 89 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/022.out.linux b/022.out.linux
index 73725483b312e49a9e51f2f2bf40f4e059d47aa6..b91d90f4e1c5448d9c4edbd74a84faed4f968447 100644 (file)
--- a/022.out.linux
+++ b/022.out.linux
@@ -13,11 +13,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_022"
-xfsdump: ino map phase 1: parsing subtree selections
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -50,7 +48,7 @@ xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
-xfsrestore: 34 directories and 94 entries processed
+xfsrestore: 30 directories and 89 entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/023.out.irix b/023.out.irix
index 267c1a609df568b0f1d0b5274bcc55f504d3135e..9d922e0a25c9636a363fa50c2b8b9d4ce18851e2 100644 (file)
--- a/023.out.irix
+++ b/023.out.irix
@@ -9,11 +9,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_023"
-xfsdump: ino map phase 1: parsing subtree selections
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/023.out.linux b/023.out.linux
index 181f24a52d7d621dccee40b2f905da57081b1fa5..e2f7192c9883362518d62349ecc1de665588606d 100644 (file)
--- a/023.out.linux
+++ b/023.out.linux
@@ -10,11 +10,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_023"
-xfsdump: ino map phase 1: parsing subtree selections
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/024.out b/024.out
index c4cd039d9dc2d9964e1fcec426c5b0a07706e10e..5cffbdc232df65fb05688040647940200dab5035 100644 (file)
--- a/024.out
+++ b/024.out
@@ -10,11 +10,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_024"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -46,11 +44,9 @@ xfsdump: level 1 incremental dump of HOSTNAME:SCRATCH_MNT based on level 0 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_024"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: preparing drive

diff --git a/025.out b/025.out
index 4d6515db3c6d2a414302fedf7f58b28b3b012ce9..1eb58ad2db030ec9e287e99289253188bceb2d1c 100644 (file)
--- a/025.out
+++ b/025.out
@@ -10,11 +10,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_025"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/026.out b/026.out
index 9f06c0bf390c9dd5bc8114a05069d5831319968c..730e5ac1a4dc9e17cf5c28bf2f2021ff68a2b7a4 100644 (file)
--- a/026.out
+++ b/026.out
@@ -8,11 +8,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_026"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/027.out b/027.out
index c40883b47c32380c84cf1e3d23b918adb030c53c..131bccd269b271ae4c65237e1800b24dcab27e62 100644 (file)
--- a/027.out
+++ b/027.out
@@ -29,11 +29,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: ""
-xfsdump: ino map phase 1: parsing subtree selections
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/028.out b/028.out
index cab4643976d517978fd4864ca35000f56c38a7ec..151827a5f382166ba1721d6a1769a1010f32fe2c 100644 (file)
--- a/028.out
+++ b/028.out
@@ -6,11 +6,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "session.0"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -30,11 +28,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "session.1"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -53,11 +49,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "session.2"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -76,11 +70,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "session.3"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -99,11 +91,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "session.4"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)

diff --git a/035.out.irix b/035.out.irix
index 1b321af098035344282c7d7a38a4dd91eadd3d28..67da9485862e8626adb3f2efc2f5506da54ca21d 100644 (file)
--- a/035.out.irix
+++ b/035.out.irix
@@ -9,11 +9,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "035.1"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -47,11 +45,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "035.2"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: preparing drive

diff --git a/035.out.linux b/035.out.linux
index 77ad736dd68c2b731df45d65d5a80040c1055dfa..21ba5796dec05865f5671e9887bf7113c5b7e9f5 100644 (file)
--- a/035.out.linux
+++ b/035.out.linux
@@ -10,11 +10,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "035.1"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -47,11 +45,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "035.2"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: preparing drive

diff --git a/036.out.irix b/036.out.irix
index 7f1a04ea33ee459e842cadd29d36b643334a290b..4eb7e0441768c41c9708b05c60ed72127e2a4c6a 100644 (file)
--- a/036.out.irix
+++ b/036.out.irix
@@ -9,16 +9,13 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_036"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
 xfsdump: preparing drive
-xfsdump: WARNING: using default tape file size: 256 Mb (use -d option to adjust file size)
 xfsdump: media block size: BLOCKSZ bytes
 xfsdump: WARNING: media may contain data. Overwrite option specified
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -42,7 +39,6 @@ xfsrestore: using minimum scsi tape (drive_minrmt) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
-xfsrestore: WARNING: using default tape file size: 256 Mb (use -d option to adjust file size)
 xfsrestore: media block size: BLOCKSZ bytes
 xfsrestore: examining media file 0
 xfsrestore: reading directories

diff --git a/036.out.linux b/036.out.linux
index 8f7473a034dd462d21d92882436da4fbfd20ac38..77e7a2c77bf89031013b24c0788a017f539772dc 100644 (file)
--- a/036.out.linux
+++ b/036.out.linux
@@ -9,11 +9,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_036"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/037.out b/037.out
index 91ab75d59803614f1a8e15e714d749bb9adf2617..aa6f25f88d6b30a0f25ba0bb528def2e07df1e43 100644 (file)
--- a/037.out
+++ b/037.out
@@ -9,11 +9,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_037"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/038.out b/038.out
index 5f8b9fa244d4e6599bde1f9c5400f31ca6db7b2d..41a6d6ec3276284e9b9d145f7f884a0bbcb06193 100644 (file)
--- a/038.out
+++ b/038.out
@@ -9,11 +9,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_038"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/039.out.irix b/039.out.irix
index 2b721e8a5d2ac1df32a610e3357dc2c41d3f8013..486a5647eefc372559954b3edc2f3c5b0a6d6a33 100644 (file)
--- a/039.out.irix
+++ b/039.out.irix
@@ -9,16 +9,13 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_039"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
 xfsdump: preparing drive
-xfsdump: WARNING: using default tape file size: 256 Mb (use -d option to adjust file size)
 xfsdump: media block size: 0 bytes
 xfsdump: WARNING: media may contain data. Overwrite option specified
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -47,7 +44,6 @@ xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
-xfsrestore: WARNING: using default tape file size: 256 Mb (use -d option to adjust file size)
 xfsrestore: examining media file 0
 xfsrestore: reading directories
 xfsrestore: 3 directories and 38 entries processed

diff --git a/039.out.linux b/039.out.linux
index b537985815529121be1ed24bc8641c96362ede2d..a36b91c25baa5034864918fdd800decbc0ad6606 100644 (file)
--- a/039.out.linux
+++ b/039.out.linux
@@ -9,11 +9,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_039"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/043.out.irix b/043.out.irix
index a8e0976b1ce51e4b2b7a53cc25f2a2e11aa5daf9..dd1b0a60bc55a65ae883b9bf06799c1f11f4f898 100644 (file)
--- a/043.out.irix
+++ b/043.out.irix
@@ -9,11 +9,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_043"
-xfsdump: ino map phase 1: parsing subtree selections
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/043.out.linux b/043.out.linux
index 75cf8135ac67215a5b9d027663966a748cd33d39..ce3e980d883ffa4c49aff54e0883923a31c92bc0 100644 (file)
--- a/043.out.linux
+++ b/043.out.linux
@@ -10,11 +10,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_043"
-xfsdump: ino map phase 1: parsing subtree selections
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/046.out b/046.out
index 9b4725b7528286ca851cb4358b76cb365f20071e..3368abbeb7e6b4c941dcbe952e0400447422d692 100644 (file)
--- a/046.out
+++ b/046.out
@@ -8,11 +8,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_046"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/047.out b/047.out
index 40ff0f9b57e82d9114ba757ce924e4a47b010032..ad62641ef5420742baa01d92a53a675b0bf5300a 100644 (file)
--- a/047.out
+++ b/047.out
@@ -6,11 +6,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "session.0"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -30,11 +28,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "session.1"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -53,11 +49,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "session.2"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -76,11 +70,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "session.3"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -99,11 +91,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "session.4"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)

diff --git a/055.out.irix b/055.out.irix
index 48250f083041fa0c48c4c75ab1d95e7687447e2a..61229948410f1a8f0d8b83ccc3ab6c3af9f97ad8 100644 (file)
--- a/055.out.irix
+++ b/055.out.irix
@@ -9,16 +9,13 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_055"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
 xfsdump: preparing drive
-xfsdump: WARNING: using default tape file size: 256 Mb (use -d option to adjust file size)
 xfsdump: media block size: 0 bytes
 xfsdump: WARNING: media may contain data. Overwrite option specified
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -47,7 +44,6 @@ xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
-xfsrestore: WARNING: using default tape file size: 256 Mb (use -d option to adjust file size)
 xfsrestore: examining media file 0
 xfsrestore: reading directories
 xfsrestore: 3 directories and 38 entries processed

diff --git a/055.out.linux b/055.out.linux
index f09dd2e47ac2160b8fea37cc8aa1dd6b17784d5e..df6cc29ea164100be29d8e1dffd82276797b426d 100644 (file)
--- a/055.out.linux
+++ b/055.out.linux
@@ -9,11 +9,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_055"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/056.out b/056.out
index fc150d0e74ef4d3b475d62e314a60edcc6767827..bcfc7c7b8e3a221d67d803763dbfe7b6de95c139 100644 (file)
--- a/056.out
+++ b/056.out
@@ -8,11 +8,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_056"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/063.out b/063.out
index 0964745b9cdb9ff79f8c24ed0f4a5c7d53d8522c..4a2f70402a9e6ef5199c29d733924d244107391f 100644 (file)
--- a/063.out
+++ b/063.out
@@ -18,11 +18,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_063"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/064 b/064
index f3e2d009bf1ecf5e70387643ac18cf54e75d5b73..27ee1dad45d258354aaec0abc7ca9fbfc2387344 100755 (executable)
--- a/064
+++ b/064
@@ -49,8 +49,11 @@ while [ $i -le 9 ]; do
     if [ $i -gt 0 ]; then
        sleep 2
        _modify_level $i
-       _stable_fs
     fi 
+
+    _stable_fs
+    sleep 2
+
     echo "********* level $i ***********" >>$seq.full
     date >>$seq.full
     find $SCRATCH_MNT -exec $here/src/lstat64 {} \; | sed 's/(00.*)//' >$tmp.dates.$i

diff --git a/064.out b/064.out
index cbedffc63236045b56d876e62950c0a04441b78d..e94199b0aee353963529f6b40f8d965a69be83be 100644 (file)
--- a/064.out
+++ b/064.out
@@ -53,11 +53,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_064"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -77,11 +75,9 @@ xfsdump: level 1 incremental dump of HOSTNAME:SCRATCH_MNT based on level 0 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_064"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -100,11 +96,9 @@ xfsdump: level 2 incremental dump of HOSTNAME:SCRATCH_MNT based on level 1 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_064"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -123,11 +117,9 @@ xfsdump: level 3 incremental dump of HOSTNAME:SCRATCH_MNT based on level 2 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_064"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -146,11 +138,9 @@ xfsdump: level 4 incremental dump of HOSTNAME:SCRATCH_MNT based on level 3 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_064"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -169,11 +159,9 @@ xfsdump: level 5 incremental dump of HOSTNAME:SCRATCH_MNT based on level 4 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_064"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -192,11 +180,9 @@ xfsdump: level 6 incremental dump of HOSTNAME:SCRATCH_MNT based on level 5 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_064"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -215,11 +201,9 @@ xfsdump: level 7 incremental dump of HOSTNAME:SCRATCH_MNT based on level 6 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_064"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -238,11 +222,9 @@ xfsdump: level 8 incremental dump of HOSTNAME:SCRATCH_MNT based on level 7 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_064"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -261,11 +243,9 @@ xfsdump: level 9 incremental dump of HOSTNAME:SCRATCH_MNT based on level 8 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_064"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)

diff --git a/065.out b/065.out
index 540b3eb7f0098abafba6a4c48af0ef04bca9771a..89cc6773691fef4d2f92f559011e554195ae25a9 100644 (file)
--- a/065.out
+++ b/065.out
@@ -18,11 +18,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_065"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -49,11 +47,9 @@ xfsdump: level 1 incremental dump of HOSTNAME:SCRATCH_MNT based on level 0 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_065"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -79,11 +75,9 @@ xfsdump: level 2 incremental dump of HOSTNAME:SCRATCH_MNT based on level 1 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_065"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -113,11 +107,9 @@ xfsdump: level 3 incremental dump of HOSTNAME:SCRATCH_MNT based on level 2 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_065"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -143,11 +135,9 @@ xfsdump: level 4 incremental dump of HOSTNAME:SCRATCH_MNT based on level 3 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_065"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -171,11 +161,9 @@ xfsdump: level 5 incremental dump of HOSTNAME:SCRATCH_MNT based on level 4 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_065"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -199,11 +187,9 @@ xfsdump: level 6 incremental dump of HOSTNAME:SCRATCH_MNT based on level 5 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_065"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -227,11 +213,9 @@ xfsdump: level 7 incremental dump of HOSTNAME:SCRATCH_MNT based on level 6 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_065"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -255,11 +239,9 @@ xfsdump: level 8 incremental dump of HOSTNAME:SCRATCH_MNT based on level 7 dump
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_065"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: pruning unneeded subtrees
-xfsdump: ino map phase 4: estimating dump size
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: pruning unneeded subtrees
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)

diff --git a/066.out b/066.out
index 63c836ad070dfb60d37636a655b9c44905030c6d..5a99b4e8aad043893d80682a2adcf3832e0859c9 100644 (file)
--- a/066.out
+++ b/066.out
@@ -11,11 +11,9 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: "stress_066"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map phase 1: constructing initial dump list
+xfsdump: ino map phase 2: skipping (no pruning necessary)
+xfsdump: ino map phase 3: skipping (only one dump stream)
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/common.dump b/common.dump
index c3b6cea0415ba87540d3f71902b22f79eb99e884..a98bf0c93d71ee7ca2f3161cdb2cdd590bc65904 100644 (file)
--- a/common.dump
+++ b/common.dump
@@ -188,7 +188,7 @@ _require_tape()
 {
     dumptape=$1
 
-    if [ -z "$dumptape" ]; then
+    if [ -z "$dumptape" -o "@" == "$dumptape" ]; then
         echo "This test requires a dump tape - none was specified"
        echo "No dump tape specified" >$seq.notrun
        status=$NOTRUNSTS
@@ -282,10 +282,10 @@ _create_dumpdir_stress()
     then
         echo "    fsstress (count=$_count) returned $? - see $here/$seq.full"
 
-        echo "--------------------------------------"       >>$here/$here/$seq.full
-        echo "output from fsstress:"                        >>$here/$here/$seq.full
-        echo "--------------------------------------"       >>$here/$here/$seq.full
-        cat $tmp.out                                        >>$here/$here/$seq.full
+        echo "--------------------------------------"       >>$here/$seq.full
+        echo "output from fsstress:"                        >>$here/$seq.full
+        echo "--------------------------------------"       >>$here/$seq.full
+        cat $tmp.out                                        >>$here/$seq.full
         status=1
     fi