From 99082b787623d1027a046f05b46a8d66da43d98b Mon Sep 17 00:00:00 2001 From: Allan Randall Date: Tue, 20 Jun 2006 16:00:17 +0000 Subject: [PATCH 1/1] 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 --- 022.out.irix | 4 +- 022.out.linux | 4 +- 023.out.irix | 4 +- 023.out.linux | 4 +- 024.out | 8 +- 025.out | 4 +- 026.out | 4 +- 027.out | 4 +- 028.out | 20 +-- 035.out.irix | 8 +- 035.out.linux | 8 +- 036.out.irix | 4 +- 036.out.linux | 4 +- 037.out | 4 +- 038.out | 4 +- 039.out.irix | 4 +- 039.out.linux | 4 +- 043.out.irix | 4 +- 043.out.linux | 4 +- 046.out | 4 +- 047.out | 404 ++++++++------------------------------------------ 055.out.irix | 4 +- 055.out.linux | 4 +- 056.out | 4 +- 063.out | 4 +- 064.out | 40 ++--- 065.out | 36 ++--- 066.out | 4 +- common.dump | 5 + 29 files changed, 121 insertions(+), 492 deletions(-) diff --git a/022.out.irix b/022.out.irix index 48fb3899..725d6cd7 100644 --- 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 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 b91d90f4..94667476 100644 --- 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 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 9d922e0a..97845dd4 100644 --- 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 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 e2f7192c..e0a11b45 100644 --- 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 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 5cffbdc2..b86573e1 100644 --- 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 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 xfsdump: ino map construction complete xfsdump: estimated dump size: NUM bytes xfsdump: preparing drive diff --git a/025.out b/025.out index 1eb58ad2..3cbf100b 100644 --- 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 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 730e5ac1..218bd297 100644 --- 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 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 131bccd2..ba425a31 100644 --- 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 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 151827a5..2b562a76 100644 --- 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 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 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 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 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 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 67da9485..653f950a 100644 --- 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 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 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 21ba5796..312a67af 100644 --- 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 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 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 4eb7e044..6680373f 100644 --- 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 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 77e7a2c7..4eaf7380 100644 --- 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 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 aa6f25f8..cd405293 100644 --- 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 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 41a6d6ec..7be4d0a6 100644 --- 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 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 486a5647..9bd188fe 100644 --- 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 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 a36b91c2..76969e3f 100644 --- 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 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 dd1b0a60..61c226cc 100644 --- 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 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 ce3e980d..f788cba6 100644 --- 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 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 3368abbe..4cd07ca6 100644 --- 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 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 ad62641e..168ada17 100644 --- 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 < 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 df6cc29e..52ea899a 100644 --- 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 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 bcfc7c7b..15496700 100644 --- 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 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 4a2f7040..30bb7f14 100644 --- 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 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 e94199b0..dc88b763 100644 --- 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 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 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 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 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 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 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 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 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 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 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 89cc6773..0938e1c1 100644 --- 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 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 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 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 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 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 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 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 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 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 5a99b4e8..f84a0b8e 100644 --- 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 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 a98bf0c9..4c8e8dbe 100644 --- 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 /' \ + -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 ' -- 2.30.2