From 2ef261210c9209befefdfcdc9484664d435f077b Mon Sep 17 00:00:00 2001 From: ptools Date: Thu, 15 Jul 2004 02:24:08 +0000 Subject: [PATCH] Fixes for IRIX tape tests. Added note about fsstress using a endian dependent random number generator. --- 022 | 4 ++ 022.out.irix | 2 - 023.out.irix | 2 - 025 | 5 +- 025.out | 87 +++++++++++++++++++++++++++++++++ 025.out.irix | 87 --------------------------------- 025.out.linux | 87 --------------------------------- 035 | 3 ++ 035.out.irix | 102 +++++++++++++++++++++++++++++++++++++++ 035.out => 035.out.linux | 0 043.out.irix | 2 - common.dump | 2 +- 12 files changed, 198 insertions(+), 185 deletions(-) delete mode 100644 025.out.irix delete mode 100644 025.out.linux create mode 100644 035.out.irix rename 035.out => 035.out.linux (100%) diff --git a/022 b/022 index 31e04e10..594d4fe8 100755 --- a/022 +++ b/022 @@ -60,6 +60,10 @@ _supported_fs xfs _supported_os IRIX Linux _require_tape $TAPE_DEV + +# note: fsstress uses an endian dependent random number generator, running this +# will produce different output for big/little endian machines. This issue was +# resolved by using different Linux/IRIX out files. _create_dumpdir_stress _erase_hard _do_dump_sub diff --git a/022.out.irix b/022.out.irix index fc848aef..354b8864 100644 --- a/022.out.irix +++ b/022.out.irix @@ -22,7 +22,6 @@ xfsdump: estimated dump size: NUM bytes xfsdump: /var/xfsdump/inventory created xfsdump: preparing drive xfsdump: media block size: BLOCKSZ bytes -xfsdump: media block size: BLOCKSZ bytes xfsdump: creating dump session media file 0 (media 0, file 0) xfsdump: dumping ino map xfsdump: dumping directories @@ -49,7 +48,6 @@ xfsrestore: using scsi tape (drive_scsitape) strategy xfsrestore: using online session inventory xfsrestore: searching media for directory dump xfsrestore: preparing drive -xfsrestore: media block size: BLOCKSZ bytes xfsrestore: examining media file 0 xfsrestore: reading directories xfsrestore: 28 directories and 100 entries processed diff --git a/023.out.irix b/023.out.irix index 1402c9dd..267c1a60 100644 --- a/023.out.irix +++ b/023.out.irix @@ -19,7 +19,6 @@ xfsdump: estimated dump size: NUM bytes xfsdump: /var/xfsdump/inventory created xfsdump: preparing drive xfsdump: media block size: BLOCKSZ bytes -xfsdump: media block size: BLOCKSZ bytes xfsdump: creating dump session media file 0 (media 0, file 0) xfsdump: dumping ino map xfsdump: dumping directories @@ -46,7 +45,6 @@ xfsrestore: using scsi tape (drive_scsitape) strategy xfsrestore: using online session inventory xfsrestore: searching media for directory dump xfsrestore: preparing drive -xfsrestore: media block size: BLOCKSZ bytes xfsrestore: examining media file 0 xfsrestore: reading directories xfsrestore: 3 directories and 38 entries processed diff --git a/025 b/025 index 4ce854db..33a7a8a4 100755 --- a/025 +++ b/025 @@ -50,12 +50,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 . ./common.rc . ./common.dump -# link correct .out file -_link_out_file $seq.out - # real QA test starts here _supported_fs xfs -_supported_os IRIX Linux +_supported_os Linux _require_tape $TAPE_DEV _create_dumpdir_fill diff --git a/025.out b/025.out index e69de29b..4d6515db 100644 --- a/025.out +++ b/025.out @@ -0,0 +1,87 @@ +QA output created by 025 +Put scsi tape driver into variable block size mode +Creating directory system to dump using src/fill. +Setup .................................... +Erasing tape +Dumping to tape... +xfsdump -m -b 1048576 -l0 -f TAPE_DEV -M stress_tape_media -L stress_025 SCRATCH_MNT +xfsdump: using minimum scsi tape (drive_minrmt) strategy +xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT +xfsdump: dump date: DATE +xfsdump: session id: ID +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 construction complete +xfsdump: estimated dump size: NUM bytes +xfsdump: /var/xfsdump/inventory created +xfsdump: preparing drive +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: dumping session inventory +xfsdump: beginning inventory media file +xfsdump: media file 1 (media 0, file 1) +xfsdump: ending inventory media file +xfsdump: inventory media file size NUM bytes +xfsdump: dump size (non-dir files) : NUM bytes +xfsdump: dump complete: SECS seconds elapsed +xfsdump: Dump Status: SUCCESS +Rewinding tape +Restoring from tape... +xfsrestore -m -b 1048576 -f TAPE_DEV -L stress_025 RESTORE_DIR +xfsrestore: using minimum scsi tape (drive_minrmt) strategy +xfsrestore: using online session inventory +xfsrestore: searching media for directory dump +xfsrestore: preparing drive +xfsrestore: examining media file 0 +xfsrestore: reading directories +xfsrestore: 3 directories and 38 entries processed +xfsrestore: directory post-processing +xfsrestore: restoring non-directory files +xfsrestore: restore complete: SECS seconds elapsed +xfsrestore: Restore Status: SUCCESS +Comparing dump directory with restore directory +Files DUMP_DIR/big and RESTORE_DIR/DUMP_SUBDIR/big are identical +Files DUMP_DIR/small and RESTORE_DIR/DUMP_SUBDIR/small are identical +Files DUMP_DIR/sub/a and RESTORE_DIR/DUMP_SUBDIR/sub/a are identical +Files DUMP_DIR/sub/a00 and RESTORE_DIR/DUMP_SUBDIR/sub/a00 are identical +Files DUMP_DIR/sub/a000 and RESTORE_DIR/DUMP_SUBDIR/sub/a000 are identical +Files DUMP_DIR/sub/b and RESTORE_DIR/DUMP_SUBDIR/sub/b are identical +Files DUMP_DIR/sub/b00 and RESTORE_DIR/DUMP_SUBDIR/sub/b00 are identical +Files DUMP_DIR/sub/big and RESTORE_DIR/DUMP_SUBDIR/sub/big are identical +Files DUMP_DIR/sub/c and RESTORE_DIR/DUMP_SUBDIR/sub/c are identical +Files DUMP_DIR/sub/c00 and RESTORE_DIR/DUMP_SUBDIR/sub/c00 are identical +Files DUMP_DIR/sub/d and RESTORE_DIR/DUMP_SUBDIR/sub/d are identical +Files DUMP_DIR/sub/d00 and RESTORE_DIR/DUMP_SUBDIR/sub/d00 are identical +Files DUMP_DIR/sub/e and RESTORE_DIR/DUMP_SUBDIR/sub/e are identical +Files DUMP_DIR/sub/e00 and RESTORE_DIR/DUMP_SUBDIR/sub/e00 are identical +Files DUMP_DIR/sub/e000 and RESTORE_DIR/DUMP_SUBDIR/sub/e000 are identical +Files DUMP_DIR/sub/f and RESTORE_DIR/DUMP_SUBDIR/sub/f are identical +Files DUMP_DIR/sub/f00 and RESTORE_DIR/DUMP_SUBDIR/sub/f00 are identical +Files DUMP_DIR/sub/g and RESTORE_DIR/DUMP_SUBDIR/sub/g are identical +Files DUMP_DIR/sub/g00 and RESTORE_DIR/DUMP_SUBDIR/sub/g00 are identical +Files DUMP_DIR/sub/h and RESTORE_DIR/DUMP_SUBDIR/sub/h are identical +Files DUMP_DIR/sub/h00 and RESTORE_DIR/DUMP_SUBDIR/sub/h00 are identical +Files DUMP_DIR/sub/h000 and RESTORE_DIR/DUMP_SUBDIR/sub/h000 are identical +Files DUMP_DIR/sub/i and RESTORE_DIR/DUMP_SUBDIR/sub/i are identical +Files DUMP_DIR/sub/i00 and RESTORE_DIR/DUMP_SUBDIR/sub/i00 are identical +Files DUMP_DIR/sub/j and RESTORE_DIR/DUMP_SUBDIR/sub/j are identical +Files DUMP_DIR/sub/j00 and RESTORE_DIR/DUMP_SUBDIR/sub/j00 are identical +Files DUMP_DIR/sub/k and RESTORE_DIR/DUMP_SUBDIR/sub/k are identical +Files DUMP_DIR/sub/k00 and RESTORE_DIR/DUMP_SUBDIR/sub/k00 are identical +Files DUMP_DIR/sub/k000 and RESTORE_DIR/DUMP_SUBDIR/sub/k000 are identical +Files DUMP_DIR/sub/l and RESTORE_DIR/DUMP_SUBDIR/sub/l are identical +Files DUMP_DIR/sub/l00 and RESTORE_DIR/DUMP_SUBDIR/sub/l00 are identical +Files DUMP_DIR/sub/m and RESTORE_DIR/DUMP_SUBDIR/sub/m are identical +Files DUMP_DIR/sub/m00 and RESTORE_DIR/DUMP_SUBDIR/sub/m00 are identical +Files DUMP_DIR/sub/n and RESTORE_DIR/DUMP_SUBDIR/sub/n are identical +Files DUMP_DIR/sub/n00 and RESTORE_DIR/DUMP_SUBDIR/sub/n00 are identical +Files DUMP_DIR/sub/small and RESTORE_DIR/DUMP_SUBDIR/sub/small are identical +Only in SCRATCH_MNT: RESTORE_SUBDIR diff --git a/025.out.irix b/025.out.irix deleted file mode 100644 index 4d6515db..00000000 --- a/025.out.irix +++ /dev/null @@ -1,87 +0,0 @@ -QA output created by 025 -Put scsi tape driver into variable block size mode -Creating directory system to dump using src/fill. -Setup .................................... -Erasing tape -Dumping to tape... -xfsdump -m -b 1048576 -l0 -f TAPE_DEV -M stress_tape_media -L stress_025 SCRATCH_MNT -xfsdump: using minimum scsi tape (drive_minrmt) strategy -xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT -xfsdump: dump date: DATE -xfsdump: session id: ID -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 construction complete -xfsdump: estimated dump size: NUM bytes -xfsdump: /var/xfsdump/inventory created -xfsdump: preparing drive -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: dumping session inventory -xfsdump: beginning inventory media file -xfsdump: media file 1 (media 0, file 1) -xfsdump: ending inventory media file -xfsdump: inventory media file size NUM bytes -xfsdump: dump size (non-dir files) : NUM bytes -xfsdump: dump complete: SECS seconds elapsed -xfsdump: Dump Status: SUCCESS -Rewinding tape -Restoring from tape... -xfsrestore -m -b 1048576 -f TAPE_DEV -L stress_025 RESTORE_DIR -xfsrestore: using minimum scsi tape (drive_minrmt) strategy -xfsrestore: using online session inventory -xfsrestore: searching media for directory dump -xfsrestore: preparing drive -xfsrestore: examining media file 0 -xfsrestore: reading directories -xfsrestore: 3 directories and 38 entries processed -xfsrestore: directory post-processing -xfsrestore: restoring non-directory files -xfsrestore: restore complete: SECS seconds elapsed -xfsrestore: Restore Status: SUCCESS -Comparing dump directory with restore directory -Files DUMP_DIR/big and RESTORE_DIR/DUMP_SUBDIR/big are identical -Files DUMP_DIR/small and RESTORE_DIR/DUMP_SUBDIR/small are identical -Files DUMP_DIR/sub/a and RESTORE_DIR/DUMP_SUBDIR/sub/a are identical -Files DUMP_DIR/sub/a00 and RESTORE_DIR/DUMP_SUBDIR/sub/a00 are identical -Files DUMP_DIR/sub/a000 and RESTORE_DIR/DUMP_SUBDIR/sub/a000 are identical -Files DUMP_DIR/sub/b and RESTORE_DIR/DUMP_SUBDIR/sub/b are identical -Files DUMP_DIR/sub/b00 and RESTORE_DIR/DUMP_SUBDIR/sub/b00 are identical -Files DUMP_DIR/sub/big and RESTORE_DIR/DUMP_SUBDIR/sub/big are identical -Files DUMP_DIR/sub/c and RESTORE_DIR/DUMP_SUBDIR/sub/c are identical -Files DUMP_DIR/sub/c00 and RESTORE_DIR/DUMP_SUBDIR/sub/c00 are identical -Files DUMP_DIR/sub/d and RESTORE_DIR/DUMP_SUBDIR/sub/d are identical -Files DUMP_DIR/sub/d00 and RESTORE_DIR/DUMP_SUBDIR/sub/d00 are identical -Files DUMP_DIR/sub/e and RESTORE_DIR/DUMP_SUBDIR/sub/e are identical -Files DUMP_DIR/sub/e00 and RESTORE_DIR/DUMP_SUBDIR/sub/e00 are identical -Files DUMP_DIR/sub/e000 and RESTORE_DIR/DUMP_SUBDIR/sub/e000 are identical -Files DUMP_DIR/sub/f and RESTORE_DIR/DUMP_SUBDIR/sub/f are identical -Files DUMP_DIR/sub/f00 and RESTORE_DIR/DUMP_SUBDIR/sub/f00 are identical -Files DUMP_DIR/sub/g and RESTORE_DIR/DUMP_SUBDIR/sub/g are identical -Files DUMP_DIR/sub/g00 and RESTORE_DIR/DUMP_SUBDIR/sub/g00 are identical -Files DUMP_DIR/sub/h and RESTORE_DIR/DUMP_SUBDIR/sub/h are identical -Files DUMP_DIR/sub/h00 and RESTORE_DIR/DUMP_SUBDIR/sub/h00 are identical -Files DUMP_DIR/sub/h000 and RESTORE_DIR/DUMP_SUBDIR/sub/h000 are identical -Files DUMP_DIR/sub/i and RESTORE_DIR/DUMP_SUBDIR/sub/i are identical -Files DUMP_DIR/sub/i00 and RESTORE_DIR/DUMP_SUBDIR/sub/i00 are identical -Files DUMP_DIR/sub/j and RESTORE_DIR/DUMP_SUBDIR/sub/j are identical -Files DUMP_DIR/sub/j00 and RESTORE_DIR/DUMP_SUBDIR/sub/j00 are identical -Files DUMP_DIR/sub/k and RESTORE_DIR/DUMP_SUBDIR/sub/k are identical -Files DUMP_DIR/sub/k00 and RESTORE_DIR/DUMP_SUBDIR/sub/k00 are identical -Files DUMP_DIR/sub/k000 and RESTORE_DIR/DUMP_SUBDIR/sub/k000 are identical -Files DUMP_DIR/sub/l and RESTORE_DIR/DUMP_SUBDIR/sub/l are identical -Files DUMP_DIR/sub/l00 and RESTORE_DIR/DUMP_SUBDIR/sub/l00 are identical -Files DUMP_DIR/sub/m and RESTORE_DIR/DUMP_SUBDIR/sub/m are identical -Files DUMP_DIR/sub/m00 and RESTORE_DIR/DUMP_SUBDIR/sub/m00 are identical -Files DUMP_DIR/sub/n and RESTORE_DIR/DUMP_SUBDIR/sub/n are identical -Files DUMP_DIR/sub/n00 and RESTORE_DIR/DUMP_SUBDIR/sub/n00 are identical -Files DUMP_DIR/sub/small and RESTORE_DIR/DUMP_SUBDIR/sub/small are identical -Only in SCRATCH_MNT: RESTORE_SUBDIR diff --git a/025.out.linux b/025.out.linux deleted file mode 100644 index 4d6515db..00000000 --- a/025.out.linux +++ /dev/null @@ -1,87 +0,0 @@ -QA output created by 025 -Put scsi tape driver into variable block size mode -Creating directory system to dump using src/fill. -Setup .................................... -Erasing tape -Dumping to tape... -xfsdump -m -b 1048576 -l0 -f TAPE_DEV -M stress_tape_media -L stress_025 SCRATCH_MNT -xfsdump: using minimum scsi tape (drive_minrmt) strategy -xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT -xfsdump: dump date: DATE -xfsdump: session id: ID -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 construction complete -xfsdump: estimated dump size: NUM bytes -xfsdump: /var/xfsdump/inventory created -xfsdump: preparing drive -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: dumping session inventory -xfsdump: beginning inventory media file -xfsdump: media file 1 (media 0, file 1) -xfsdump: ending inventory media file -xfsdump: inventory media file size NUM bytes -xfsdump: dump size (non-dir files) : NUM bytes -xfsdump: dump complete: SECS seconds elapsed -xfsdump: Dump Status: SUCCESS -Rewinding tape -Restoring from tape... -xfsrestore -m -b 1048576 -f TAPE_DEV -L stress_025 RESTORE_DIR -xfsrestore: using minimum scsi tape (drive_minrmt) strategy -xfsrestore: using online session inventory -xfsrestore: searching media for directory dump -xfsrestore: preparing drive -xfsrestore: examining media file 0 -xfsrestore: reading directories -xfsrestore: 3 directories and 38 entries processed -xfsrestore: directory post-processing -xfsrestore: restoring non-directory files -xfsrestore: restore complete: SECS seconds elapsed -xfsrestore: Restore Status: SUCCESS -Comparing dump directory with restore directory -Files DUMP_DIR/big and RESTORE_DIR/DUMP_SUBDIR/big are identical -Files DUMP_DIR/small and RESTORE_DIR/DUMP_SUBDIR/small are identical -Files DUMP_DIR/sub/a and RESTORE_DIR/DUMP_SUBDIR/sub/a are identical -Files DUMP_DIR/sub/a00 and RESTORE_DIR/DUMP_SUBDIR/sub/a00 are identical -Files DUMP_DIR/sub/a000 and RESTORE_DIR/DUMP_SUBDIR/sub/a000 are identical -Files DUMP_DIR/sub/b and RESTORE_DIR/DUMP_SUBDIR/sub/b are identical -Files DUMP_DIR/sub/b00 and RESTORE_DIR/DUMP_SUBDIR/sub/b00 are identical -Files DUMP_DIR/sub/big and RESTORE_DIR/DUMP_SUBDIR/sub/big are identical -Files DUMP_DIR/sub/c and RESTORE_DIR/DUMP_SUBDIR/sub/c are identical -Files DUMP_DIR/sub/c00 and RESTORE_DIR/DUMP_SUBDIR/sub/c00 are identical -Files DUMP_DIR/sub/d and RESTORE_DIR/DUMP_SUBDIR/sub/d are identical -Files DUMP_DIR/sub/d00 and RESTORE_DIR/DUMP_SUBDIR/sub/d00 are identical -Files DUMP_DIR/sub/e and RESTORE_DIR/DUMP_SUBDIR/sub/e are identical -Files DUMP_DIR/sub/e00 and RESTORE_DIR/DUMP_SUBDIR/sub/e00 are identical -Files DUMP_DIR/sub/e000 and RESTORE_DIR/DUMP_SUBDIR/sub/e000 are identical -Files DUMP_DIR/sub/f and RESTORE_DIR/DUMP_SUBDIR/sub/f are identical -Files DUMP_DIR/sub/f00 and RESTORE_DIR/DUMP_SUBDIR/sub/f00 are identical -Files DUMP_DIR/sub/g and RESTORE_DIR/DUMP_SUBDIR/sub/g are identical -Files DUMP_DIR/sub/g00 and RESTORE_DIR/DUMP_SUBDIR/sub/g00 are identical -Files DUMP_DIR/sub/h and RESTORE_DIR/DUMP_SUBDIR/sub/h are identical -Files DUMP_DIR/sub/h00 and RESTORE_DIR/DUMP_SUBDIR/sub/h00 are identical -Files DUMP_DIR/sub/h000 and RESTORE_DIR/DUMP_SUBDIR/sub/h000 are identical -Files DUMP_DIR/sub/i and RESTORE_DIR/DUMP_SUBDIR/sub/i are identical -Files DUMP_DIR/sub/i00 and RESTORE_DIR/DUMP_SUBDIR/sub/i00 are identical -Files DUMP_DIR/sub/j and RESTORE_DIR/DUMP_SUBDIR/sub/j are identical -Files DUMP_DIR/sub/j00 and RESTORE_DIR/DUMP_SUBDIR/sub/j00 are identical -Files DUMP_DIR/sub/k and RESTORE_DIR/DUMP_SUBDIR/sub/k are identical -Files DUMP_DIR/sub/k00 and RESTORE_DIR/DUMP_SUBDIR/sub/k00 are identical -Files DUMP_DIR/sub/k000 and RESTORE_DIR/DUMP_SUBDIR/sub/k000 are identical -Files DUMP_DIR/sub/l and RESTORE_DIR/DUMP_SUBDIR/sub/l are identical -Files DUMP_DIR/sub/l00 and RESTORE_DIR/DUMP_SUBDIR/sub/l00 are identical -Files DUMP_DIR/sub/m and RESTORE_DIR/DUMP_SUBDIR/sub/m are identical -Files DUMP_DIR/sub/m00 and RESTORE_DIR/DUMP_SUBDIR/sub/m00 are identical -Files DUMP_DIR/sub/n and RESTORE_DIR/DUMP_SUBDIR/sub/n are identical -Files DUMP_DIR/sub/n00 and RESTORE_DIR/DUMP_SUBDIR/sub/n00 are identical -Files DUMP_DIR/sub/small and RESTORE_DIR/DUMP_SUBDIR/sub/small are identical -Only in SCRATCH_MNT: RESTORE_SUBDIR diff --git a/035 b/035 index 6691dc0a..4703c5ad 100755 --- a/035 +++ b/035 @@ -50,6 +50,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 . ./common.rc . ./common.dump +# link correct .out file +_link_out_file $seq.out + # real QA test starts here _supported_fs xfs _supported_os IRIX Linux diff --git a/035.out.irix b/035.out.irix new file mode 100644 index 00000000..1b321af0 --- /dev/null +++ b/035.out.irix @@ -0,0 +1,102 @@ +QA output created by 035 +Creating directory system to dump using src/fill. +Setup .................................... +Erasing tape +Dumping to tape... +xfsdump -f TAPE_DEV -M stress_tape_media -L 035.1 SCRATCH_MNT +xfsdump: using scsi tape (drive_scsitape) strategy +xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT +xfsdump: dump date: DATE +xfsdump: session id: ID +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 construction complete +xfsdump: estimated dump size: NUM bytes +xfsdump: /var/xfsdump/inventory created +xfsdump: preparing drive +xfsdump: media block size: BLOCKSZ 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: dumping session inventory +xfsdump: beginning inventory media file +xfsdump: media file 1 (media 0, file 1) +xfsdump: ending inventory media file +xfsdump: inventory media file size NUM bytes +xfsdump: writing stream terminator +xfsdump: beginning media stream terminator +xfsdump: media file 2 (media 0, file 2) +xfsdump: ending media stream terminator +xfsdump: media stream terminator size BLOCKSZ bytes +xfsdump: dump size (non-dir files) : NUM bytes +xfsdump: dump complete: SECS seconds elapsed +xfsdump: Dump Status: SUCCESS +Creating directory system to dump using src/fill. +Setup .... +Dumping to tape... +xfsdump -f TAPE_DEV -M stress_tape_media -L 035.2 SCRATCH_MNT +xfsdump: using scsi tape (drive_scsitape) strategy +xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT +xfsdump: dump date: DATE +xfsdump: session id: ID +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 construction complete +xfsdump: estimated dump size: NUM bytes +xfsdump: preparing drive +xfsdump: positioned at media file 0: dump 0, stream 0 +xfsdump: positioned at media file 1: dump 0, stream 0 +xfsdump: positioned at media file 2: dump 0, stream 0 +xfsdump: stream terminator found +xfsdump: creating dump session media file 0 (media 0, file 2) +xfsdump: dumping ino map +xfsdump: dumping directories +xfsdump: dumping non-directory files +xfsdump: ending media file +xfsdump: media file size NUM bytes +xfsdump: dumping session inventory +xfsdump: beginning inventory media file +xfsdump: media file 1 (media 0, file 3) +xfsdump: ending inventory media file +xfsdump: inventory media file size NUM bytes +xfsdump: writing stream terminator +xfsdump: beginning media stream terminator +xfsdump: media file 2 (media 0, file 4) +xfsdump: ending media stream terminator +xfsdump: media stream terminator size BLOCKSZ bytes +xfsdump: dump size (non-dir files) : NUM bytes +xfsdump: dump complete: SECS seconds elapsed +xfsdump: Dump Status: SUCCESS +Rewinding tape +Restoring from tape... +xfsrestore -f TAPE_DEV -L 035.2 RESTORE_DIR +xfsrestore: using scsi tape (drive_scsitape) strategy +xfsrestore: using online session inventory +xfsrestore: searching media for directory dump +xfsrestore: preparing drive +xfsrestore: examining media file 0 +xfsrestore: examining media file 1 +xfsrestore: examining media file 2 +xfsrestore: reading directories +xfsrestore: 3 directories and 6 entries processed +xfsrestore: directory post-processing +xfsrestore: restoring non-directory files +xfsrestore: restore complete: SECS seconds elapsed +xfsrestore: Restore Status: SUCCESS +Comparing dump directory with restore directory +Files DUMP_DIR/biggg and RESTORE_DIR/DUMP_SUBDIR/biggg are identical +Files DUMP_DIR/smalll and RESTORE_DIR/DUMP_SUBDIR/smalll are identical +Files DUMP_DIR/sub/biggg and RESTORE_DIR/DUMP_SUBDIR/sub/biggg are identical +Files DUMP_DIR/sub/smalll and RESTORE_DIR/DUMP_SUBDIR/sub/smalll are identical +Only in SCRATCH_MNT: RESTORE_SUBDIR diff --git a/035.out b/035.out.linux similarity index 100% rename from 035.out rename to 035.out.linux diff --git a/043.out.irix b/043.out.irix index 5daa6ed2..a8e0976b 100644 --- a/043.out.irix +++ b/043.out.irix @@ -19,7 +19,6 @@ xfsdump: estimated dump size: NUM bytes xfsdump: /var/xfsdump/inventory created xfsdump: preparing drive xfsdump: media block size: BLOCKSZ bytes -xfsdump: media block size: BLOCKSZ bytes xfsdump: creating dump session media file 0 (media 0, file 0) xfsdump: dumping ino map xfsdump: dumping directories @@ -45,7 +44,6 @@ xfsrestore -f TAPE_DEV -L stress_043 RESTORE_DIR xfsrestore: using scsi tape (drive_scsitape) strategy xfsrestore: searching media for dump xfsrestore: preparing drive -xfsrestore: media block size: BLOCKSZ bytes xfsrestore: examining media file 0 xfsrestore: found dump matching specified label: xfsrestore: hostname: HOSTNAME diff --git a/common.dump b/common.dump index 371e6050..4802fd3a 100644 --- a/common.dump +++ b/common.dump @@ -759,7 +759,7 @@ _ls_filter() /^c/ { date = $9; sub(date,"DATE"); print} /^d/ { size = $5; sub(size,"SIZE"); print} {print}' \ - | sed -e 's/total [0-9][0-9]*/total TOTAL/' -e 's/[ \t][ \t]*/ /g' + | sed -e 's/total [0-9][0-9]*/total TOTAL/' } -- 2.47.3