Added filter to allow older versions of xfsdump to pass xfsqa

Merge of master-melb:xfs-cmds:26294a by kenmcd.

  Added filter to allow older versions of xfsdump to pass xfsqa

diff --git a/022.out.irix b/022.out.irix
index 48fb389925806433f4238a2607cb2b3340a6ddda..725d6cd78c1e8c3ffdbaaaeec4a299ee5c7f15c0 100644 (file)
--- a/022.out.irix
+++ b/022.out.irix
@@ -12,9 +12,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/022.out.linux b/022.out.linux
index b91d90f4e1c5448d9c4edbd74a84faed4f968447..94667476d7d47193597d307b62d3c2fb1be10e3a 100644 (file)
--- a/022.out.linux
+++ b/022.out.linux
@@ -13,9 +13,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/023.out.irix b/023.out.irix
index 9d922e0a25c9636a363fa50c2b8b9d4ce18851e2..97845dd485a3367588c0756787b0be89c3d223f5 100644 (file)
--- a/023.out.irix
+++ b/023.out.irix
@@ -9,9 +9,7 @@ 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: 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 <PHASES>
 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 e2f7192c9883362518d62349ecc1de665588606d..e0a11b45a7dd4e3312ecf4a053c16e2a1b4be757 100644 (file)
--- a/023.out.linux
+++ b/023.out.linux
@@ -10,9 +10,7 @@ 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: 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 <PHASES>
 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 5cffbdc232df65fb05688040647940200dab5035..b86573e19563ddee7d61285cc3ff7e9e47199310 100644 (file)
--- a/024.out
+++ b/024.out
@@ -10,9 +10,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -44,9 +42,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: preparing drive

diff --git a/025.out b/025.out
index 1eb58ad2db030ec9e287e99289253188bceb2d1c..3cbf100bc7ad0c6a797df0121be1e4ff5765a200 100644 (file)
--- a/025.out
+++ b/025.out
@@ -10,9 +10,7 @@ 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: 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 <PHASES>
 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 730e5ac1a4dc9e17cf5c28bf2f2021ff68a2b7a4..218bd297274c6a7cc47157a35ddcb711d0570da7 100644 (file)
--- a/026.out
+++ b/026.out
@@ -8,9 +8,7 @@ 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: 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 <PHASES>
 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 131bccd269b271ae4c65237e1800b24dcab27e62..ba425a317369822f6aa83a613ebdbd8bcf715caf 100644 (file)
--- a/027.out
+++ b/027.out
@@ -29,9 +29,7 @@ xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
 xfsdump: dump date: DATE
 xfsdump: session id: ID
 xfsdump: session label: ""
-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 <PHASES>
 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 151827a5f382166ba1721d6a1769a1010f32fe2c..2b562a7643e9946999ad7b6e8276c7be1790d937 100644 (file)
--- a/028.out
+++ b/028.out
@@ -6,9 +6,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -28,9 +26,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -49,9 +45,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -70,9 +64,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -91,9 +83,7 @@ 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: 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 <PHASES>
 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 67da9485862e8626adb3f2efc2f5506da54ca21d..653f950a04584b6721f1754075c0bdcdf71208ae 100644 (file)
--- a/035.out.irix
+++ b/035.out.irix
@@ -9,9 +9,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -45,9 +43,7 @@ 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: 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 <PHASES>
 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 21ba5796dec05865f5671e9887bf7113c5b7e9f5..312a67af60edb059d56960ff872fdfdf76f4896e 100644 (file)
--- a/035.out.linux
+++ b/035.out.linux
@@ -10,9 +10,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -45,9 +43,7 @@ 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: 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 <PHASES>
 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 4eb7e0441768c41c9708b05c60ed72127e2a4c6a..6680373fd7f9a973b569e4feccd9fa1c083801ae 100644 (file)
--- a/036.out.irix
+++ b/036.out.irix
@@ -9,9 +9,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/036.out.linux b/036.out.linux
index 77e7a2c77bf89031013b24c0788a017f539772dc..4eaf7380f562613204b793a0747661bc878a6a02 100644 (file)
--- a/036.out.linux
+++ b/036.out.linux
@@ -9,9 +9,7 @@ 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: 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 <PHASES>
 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 aa6f25f88d6b30a0f25ba0bb528def2e07df1e43..cd4052939b93ba0a65efa3002a41d855cfc91a68 100644 (file)
--- a/037.out
+++ b/037.out
@@ -9,9 +9,7 @@ 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: 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 <PHASES>
 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 41a6d6ec3276284e9b9d145f7f884a0bbcb06193..7be4d0a695ae446744a8c36e8d9aaffc471559ac 100644 (file)
--- a/038.out
+++ b/038.out
@@ -9,9 +9,7 @@ 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: 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 <PHASES>
 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 486a5647eefc372559954b3edc2f3c5b0a6d6a33..9bd188fefb5514e230ec5a18b2a8b80e1490492c 100644 (file)
--- a/039.out.irix
+++ b/039.out.irix
@@ -9,9 +9,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/039.out.linux b/039.out.linux
index a36b91c25baa5034864918fdd800decbc0ad6606..76969e3f34645c3cc54d2907f46e1d6d265e9008 100644 (file)
--- a/039.out.linux
+++ b/039.out.linux
@@ -9,9 +9,7 @@ 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: 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 <PHASES>
 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 dd1b0a60bc55a65ae883b9bf06799c1f11f4f898..61c226cc4e9e36e8f20d18ee4a4bd7c46c1dfc6f 100644 (file)
--- a/043.out.irix
+++ b/043.out.irix
@@ -9,9 +9,7 @@ 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: 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 <PHASES>
 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 ce3e980d883ffa4c49aff54e0883923a31c92bc0..f788cba6531f0cf09e4a3b950308c4e1de27884e 100644 (file)
--- a/043.out.linux
+++ b/043.out.linux
@@ -10,9 +10,7 @@ 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: 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 <PHASES>
 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 3368abbeb7e6b4c941dcbe952e0400447422d692..4cd07ca66a04688a037e55e387b45b9bfd208abd 100644 (file)
--- a/046.out
+++ b/046.out
@@ -8,9 +8,7 @@ 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: 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 <PHASES>
 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 ad62641ef5420742baa01d92a53a675b0bf5300a..168ada17361f32e495a041886eb8b3cdf21e467e 100644 (file)
--- a/047.out
+++ b/047.out
@@ -1,345 +1,71 @@
-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
-xfsdump: session label: "session.0"
-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: creating dump session media file 0 (media 0, file 0)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : NUM bytes
-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
-xfsdump: session label: "session.1"
-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)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : NUM bytes
-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
-xfsdump: session label: "session.2"
-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)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : NUM bytes
-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
-xfsdump: session label: "session.3"
-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)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : NUM bytes
-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
-xfsdump: session label: "session.4"
-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)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : NUM bytes
-xfsdump: dump complete: SECS seconds elapsed
-xfsdump: Dump Status: SUCCESS
-file system 0:
-       fs ID: ID
-       session 0:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.0"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino INO offset 0
-                       end:            ino INO offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     NUM
-                               mfile start:    ino INO offset 0
-                               mfile end:      ino INO offset 0
-                               media label:    "stress_tape_media"
-                               media ID: ID
-       session 1:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.1"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino INO offset 0
-                       end:            ino INO offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     NUM
-                               mfile start:    ino INO offset 0
-                               mfile end:      ino INO offset 0
-                               media label:    "stress_tape_media"
-                               media ID: ID
-       session 2:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.2"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino INO offset 0
-                       end:            ino INO offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     NUM
-                               mfile start:    ino INO offset 0
-                               mfile end:      ino INO offset 0
-                               media label:    "stress_tape_media"
-                               media ID: ID
-       session 3:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.3"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino INO offset 0
-                       end:            ino INO offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     NUM
-                               mfile start:    ino INO offset 0
-                               mfile end:      ino INO offset 0
-                               media label:    "stress_tape_media"
-                               media ID: ID
-       session 4:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.4"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino INO offset 0
-                       end:            ino INO offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     NUM
-                               mfile start:    ino INO offset 0
-                               mfile end:      ino INO offset 0
-                               media label:    "stress_tape_media"
-                               media ID: ID
-xfsdump: Dump Status: SUCCESS
-Processing file /var/xfsdump/inventory/UUIDstab
-   Found entry for HOSTNAME:SCRATCH_MNT
-     Match on hostname and path
-      processing index file 
-       /var/xfsdump/inventory/UUID.InvIndex
-         Checking access for
-          /var/xfsdump/inventory/UUID.StObj
-          Mount point match
-            Session 0: HOSTNAME:SCRATCH_MNT
--------------------------------------------------
-An entry matching the mount point/time is :
-UUID           :       ID
-MOUNT POINT    :       HOSTNAME:SCRATCH_MNT
-DEV PATH       :       HOSTNAME:SCRATCH_DEV
-TIME OF DUMP   :       TIME
+#! /bin/sh
+# FS QA Test No. 047
+#
+# invutil with interactive responses
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2000-2001 Silicon Graphics, Inc.  All Rights Reserved.
+#-----------------------------------------------------------------------
+#
+# creator
+owner=tes@sgi.com
 
-Do you want to prune this entry: [y/n]
+seq=`basename $0`
+echo "QA output created by $seq"
 
-            Session 1: HOSTNAME:SCRATCH_MNT
--------------------------------------------------
-An entry matching the mount point/time is :
-UUID           :       ID
-MOUNT POINT    :       HOSTNAME:SCRATCH_MNT
-DEV PATH       :       HOSTNAME:SCRATCH_DEV
-TIME OF DUMP   :       TIME
+here=`pwd`
+tmp=/tmp/$$
+status=1       # failure is the default!
+trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
-Do you want to prune this entry: [y/n]
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.dump
 
-            Session 2: HOSTNAME:SCRATCH_MNT
--------------------------------------------------
-An entry matching the mount point/time is :
-UUID           :       ID
-MOUNT POINT    :       HOSTNAME:SCRATCH_MNT
-DEV PATH       :       HOSTNAME:SCRATCH_DEV
-TIME OF DUMP   :       TIME
+# real QA test starts here
+_supported_fs xfs
+_supported_os IRIX Linux
 
-Do you want to prune this entry: [y/n]
+# wipe test dir clean first
+# so dump can be real quick
+_wipe_fs
 
-            Session 3: HOSTNAME:SCRATCH_MNT
-            Session 4: HOSTNAME:SCRATCH_MNT
-file system 0:
-       fs ID: ID
-       session 0:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.0"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino INO offset 0
-                       end:            ino INO offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     NUM
-                               mfile start:    ino INO offset 0
-                               mfile end:      ino INO offset 0
-                               media label:    "stress_tape_media"
-                               media ID: ID
-       session 1:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.3"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino INO offset 0
-                       end:            ino INO offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     NUM
-                               mfile start:    ino INO offset 0
-                               mfile end:      ino INO offset 0
-                               media label:    "stress_tape_media"
-                               media ID: ID
-       session 2:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.4"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino INO offset 0
-                       end:            ino INO offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     NUM
-                               mfile start:    ino INO offset 0
-                               mfile end:      ino INO offset 0
-                               media label:    "stress_tape_media"
-                               media ID: ID
-xfsdump: Dump Status: SUCCESS
+#
+# Create 5 dumps
+# and on the 3rd dump note the date
+# which we'll use to prune against using xfsinvutil
+#
+i=0
+while [ $i -lt 5 ]; do
+    _do_dump_file -L "session.$i"
+    if [ $i -eq 2 ]; then
+       sleep 1
+       middate=`date '+%m/%d/%Y %T'`
+    fi
+    rm $dump_file
+    sleep 2
+    i=`expr $i + 1`
+done
+
+echo "middate = $middate" >>$seq.full
+
+# Only say No to 1st question to prune
+cat >$tmp.input <<EOF
+N
+Y
+Y
+Y
+Y
+EOF
+
+#
+# Now do the xfsinvutil and
+# look and the inventory before and after
+# to see if it did the job
+#
+_dump_inventory
+_do_invutil <$tmp.input
+_dump_inventory
+
+status=0
+exit

diff --git a/055.out.irix b/055.out.irix
index 61229948410f1a8f0d8b83ccc3ab6c3af9f97ad8..8bff6e9c18cda9442b8a1b444d4f06d05eb9a66a 100644 (file)
--- a/055.out.irix
+++ b/055.out.irix
@@ -9,9 +9,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/055.out.linux b/055.out.linux
index df6cc29ea164100be29d8e1dffd82276797b426d..52ea899ae7b9a2b8107631af229961481df11974 100644 (file)
--- a/055.out.linux
+++ b/055.out.linux
@@ -9,9 +9,7 @@ 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: 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 <PHASES>
 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 bcfc7c7b8e3a221d67d803763dbfe7b6de95c139..15496700b8a5f6ec107fc6582aee124be67e89b8 100644 (file)
--- a/056.out
+++ b/056.out
@@ -8,9 +8,7 @@ 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: 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 <PHASES>
 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 4a2f70402a9e6ef5199c29d733924d244107391f..30bb7f14671154871beb2c6cb04eeee91be0daf8 100644 (file)
--- a/063.out
+++ b/063.out
@@ -18,9 +18,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created

diff --git a/064.out b/064.out
index e94199b0aee353963529f6b40f8d965a69be83be..dc88b763f6bce8d89534e1effc8e730aafd457e5 100644 (file)
--- a/064.out
+++ b/064.out
@@ -53,9 +53,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -75,9 +73,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -96,9 +92,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -117,9 +111,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -138,9 +130,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -159,9 +149,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -180,9 +168,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -201,9 +187,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -222,9 +206,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -243,9 +225,7 @@ 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: 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 <PHASES>
 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 89cc6773691fef4d2f92f559011e554195ae25a9..0938e1c1b3d7f65e5d87d65401a8f1dab1592b39 100644 (file)
--- a/065.out
+++ b/065.out
@@ -18,9 +18,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
@@ -47,9 +45,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -75,9 +71,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -107,9 +101,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -135,9 +127,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -161,9 +151,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -187,9 +175,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -213,9 +199,7 @@ 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: 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 <PHASES>
 xfsdump: ino map construction complete
 xfsdump: estimated dump size: NUM bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -239,9 +223,7 @@ 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: 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 <PHASES>
 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 5a99b4e8aad043893d80682a2adcf3832e0859c9..f84a0b8e9f98a7af8d8578aff17adfef4f8fa8f3 100644 (file)
--- a/066.out
+++ b/066.out
@@ -11,9 +11,7 @@ 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: 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 <PHASES>
 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 a98bf0c93d71ee7ca2f3161cdb2cdd590bc65904..4c8e8dbe72e0f5ecff7c18b919ce18873b4b5d50 100644 (file)
--- a/common.dump
+++ b/common.dump
@@ -791,6 +791,11 @@ _dump_filter_main()
       -e 's/(pid[       ]*[1-9][0-9]*)/\(pid PID\)/'   \
       -e '/version 3\.0/d'                             \
       -e 's/\/hw\/module.*$/SCRATCH_DEV/'              \
+      -e 's/xfsdump: ino map phase 1: .*/xfsdump: ino map <PHASES>/' \
+      -e '/xfsdump: ino map phase [2]/,1d'             \
+      -e '/xfsdump: ino map phase [3]/,1d'             \
+      -e '/xfsdump: ino map phase [4]/,1d'             \
+      -e '/xfsdump: ino map phase [5]/,1d'             \
       -e 's/id:[[:space:]]*[0-9a-f]\{8\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{12\}/ID: ID/'                                             \
       -e 's/\[y\/n\][- ]----------------------*/\[y\/n\]/'             \
   | perl -ne '