Patch "rework large filesystem testing" introduces a new option --large-fs
which creates a new file $SCRATCH_MNT/.use_space. If this 10 part patchset is
applied, the following tests will fail:
019 026 027 028 046 047 050 056 059 060 062 063 064 065 066
This patch accounts for the following new output when testing xfs filesystems
with
the --large-fs option by creating new output file to compare against
($seq.largefs.out):
1. The following four lines appear in test 019.
File: "./.use_space"
Size: 6312890368 Filetype: Regular File
Mode: (0600/-rw-------) Uid: (0) Gid: (0)
Device: <DEVICE> Inode: <INODE> Links: 1
2. When the nodump attribute is set, the xfsdump -e option will cause the
following additional lines to appear.
xfsdump: NOTE: pruned 1 files: skip attribute set
Only in SCRATCH_MNT: .use_space
SCRATCH_MNT/.use_space
3. Number of files off by one.
xfsrestore: # directories and (off by 1) entries processed
[ROOT] 0 0 0 00 [--------] (off by 1) 0 0 00 [--------] 0 0 0 00
[--------]
This patch also modifies check and common.quota to use the new output file
$seq.largefs.out when the --large-fs option is used (LARGE_SCRATCH_DEV = yes)
or $seq.out when the --large-fs option is NOT used (LARGE_SCRATCH_DEV != yes).
Signed-off-by: Rich Johnston <rjohnston@xxxxxxx>
---
019.largefs.out | 5 +++
026.largefs.out | 4 ++-
027.largefs.out | 2 -
028.largefs.out | 5 +++
046.largefs.out | 3 +-
047.largefs.out | 5 +++
050.largefs.out | 72 ++++++++++++++++++++++++++++----------------------------
056.largefs.out | 3 +-
059.largefs.out | 2 +
060.largefs.out | 4 ++-
062.largefs.out | 2 +
063.largefs.out | 3 +-
064.largefs.out | 41 ++++++++++++++++---------------
065.largefs.out | 29 +++++++++++-----------
066.largefs.out | 3 +-
check | 12 +++++++--
common.quota | 20 ++++++++++-----
17 files changed, 128 insertions(+), 87 deletions(-)
Index: b/019.largefs.out
===================================================================
--- a/019.largefs.out
+++ b/019.largefs.out
@@ -9,6 +9,11 @@ Wrote 2048.00Kb (value 0x2c)
Mode: (0777/drwxrwxrwx) Uid: (3) Gid: (1)
Device: <DEVICE> Inode: <INODE> Links: 3
+ File: "./.use_space"
+ Size: 6312890368 Filetype: Regular File
+ Mode: (0600/-rw-------) Uid: (0) Gid: (0)
+Device: <DEVICE> Inode: <INODE> Links: 1
+
File: "./bigfile"
Size: 2097152 Filetype: Regular File
Mode: (0666/-rw-rw-rw-) Uid: (3) Gid: (0)
Index: b/026.largefs.out
===================================================================
--- a/026.largefs.out
+++ b/026.largefs.out
@@ -9,6 +9,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "stress_026"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: /var/xfsdump/inventory created
@@ -28,12 +29,13 @@ xfsrestore: using online session invento
xfsrestore: searching media for directory dump
xfsrestore: examining media file 0
xfsrestore: reading directories
-xfsrestore: 3 directories and 38 entries processed
+xfsrestore: 3 directories and 39 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS
Comparing dump directory with restore directory
+Only in SCRATCH_MNT: .use_space
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
Index: b/027.largefs.out
===================================================================
--- a/027.largefs.out
+++ b/027.largefs.out
@@ -19,7 +19,7 @@ xfsrestore: session id: ID
xfsrestore: media ID: ID
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 3 directories and 39 entries processed
+xfsrestore: 3 directories and 40 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
Index: b/028.largefs.out
===================================================================
--- a/028.largefs.out
+++ b/028.largefs.out
@@ -7,6 +7,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "session.0"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: /var/xfsdump/inventory created
@@ -27,6 +28,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "session.1"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -46,6 +48,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "session.2"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -65,6 +68,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "session.3"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -84,6 +88,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "session.4"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: creating dump session media file 0 (media 0, file 0)
Index: b/046.largefs.out
===================================================================
--- a/046.largefs.out
+++ b/046.largefs.out
@@ -9,6 +9,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "stress_046"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: /var/xfsdump/inventory created
@@ -28,7 +29,7 @@ xfsrestore: using online session invento
xfsrestore: searching media for directory dump
xfsrestore: examining media file 0
xfsrestore: reading directories
-xfsrestore: 3 directories and 10 entries processed
+xfsrestore: 3 directories and 11 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
Index: b/047.largefs.out
===================================================================
--- a/047.largefs.out
+++ b/047.largefs.out
@@ -7,6 +7,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "session.0"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: /var/xfsdump/inventory created
@@ -27,6 +28,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "session.1"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -46,6 +48,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "session.2"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -65,6 +68,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "session.3"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: creating dump session media file 0 (media 0, file 0)
@@ -84,6 +88,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "session.4"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: creating dump session media file 0 (media 0, file 0)
Index: b/050.largefs.out
===================================================================
--- a/050.largefs.out
+++ b/050.largefs.out
@@ -8,26 +8,26 @@ log =LDEV bsize=XXX blocks=XXX
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
*** report no quota settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
*** report initial settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft inode limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 3 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft block limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [7 days] 4 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the hard inode limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
*** push past the hard block limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] =OK= 100 500 00 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
*** unmount
@@ -40,26 +40,26 @@ log =LDEV bsize=XXX blocks=XXX
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
*** report no quota settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
*** report initial settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft inode limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 3 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft block limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [7 days] 4 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the hard inode limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
*** push past the hard block limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] =OK= 100 500 00 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
*** unmount
@@ -72,26 +72,26 @@ log =LDEV bsize=XXX blocks=XXX
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
*** report no quota settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
*** report initial settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft inode limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 3 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft block limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [--------] 4 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the hard inode limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [--------] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** push past the hard block limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 540 100 500 00 [--none--] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** unmount
@@ -104,26 +104,26 @@ log =LDEV bsize=XXX blocks=XXX
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
*** report no quota settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
*** report initial settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft inode limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 3 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft block limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [--------] 4 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the hard inode limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [--------] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** push past the hard block limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 540 100 500 00 [--none--] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** unmount
@@ -136,26 +136,26 @@ log =LDEV bsize=XXX blocks=XXX
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
*** report no quota settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
*** report initial settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft inode limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 3 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft block limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [7 days] 4 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the hard inode limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [7 days] 9 4 10 00 [7 days] 0 0 0 00 [--------]
*** push past the hard block limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] =OK= 100 500 00 [7 days] 9 4 10 00 [7 days] 0 0 0 00 [--------]
*** unmount
@@ -168,26 +168,26 @@ log =LDEV bsize=XXX blocks=XXX
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
*** report no quota settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
*** report initial settings
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft inode limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 0 100 500 00 [--------] 3 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the soft block limit
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [--------] 4 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the hard inode limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [--------] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** push past the hard block limit (expect EDQUOT)
-[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
+[ROOT] 0 0 0 00 [--------] 4 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 540 100 500 00 [--none--] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** unmount
Index: b/056.largefs.out
===================================================================
--- a/056.largefs.out
+++ b/056.largefs.out
@@ -9,6 +9,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "stress_056"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: /var/xfsdump/inventory created
@@ -28,7 +29,7 @@ xfsrestore: using online session invento
xfsrestore: searching media for directory dump
xfsrestore: examining media file 0
xfsrestore: reading directories
-xfsrestore: 7 directories and 11 entries processed
+xfsrestore: 7 directories and 12 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
Index: b/059.largefs.out
===================================================================
--- a/059.largefs.out
+++ b/059.largefs.out
@@ -12,6 +12,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "stress_059"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: stream 0: ino INO offset NUM to ino INO offset NUM
xfsdump: stream 1: ino INO offset NUM to ino INO offset NUM
xfsdump: stream 2: ino INO offset NUM to ino INO offset NUM
@@ -34,6 +35,7 @@ xfsrestore: Restore Status: SUCCESS
Comparing listing of dump directory with restore directory
Files TMP.dump_dir and TMP.restore_dir are identical
Comparing dump directory with restore directory
+Only in SCRATCH_MNT: .use_space
Files DUMP_DIR/big and RESTORE_DIR/DUMP_SUBDIR/big are identical
Files DUMP_DIR/large000 and RESTORE_DIR/DUMP_SUBDIR/large000 are identical
Files DUMP_DIR/large111 and RESTORE_DIR/DUMP_SUBDIR/large111 are identical
Index: b/060.largefs.out
===================================================================
--- a/060.largefs.out
+++ b/060.largefs.out
@@ -12,6 +12,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "stress_060"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: stream 0: ino INO offset NUM to ino INO offset NUM
xfsdump: stream 1: ino INO offset NUM to ino INO offset NUM
xfsdump: stream 2: ino INO offset NUM to ino INO offset NUM
@@ -42,7 +43,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 3 directories and 41 entries processed
+xfsrestore: 3 directories and 42 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: NOTE: restore interrupted: SECS seconds elapsed: may resume later
using -R option
@@ -77,6 +78,7 @@ xfsrestore: Restore Status: SUCCESS
Comparing listing of dump directory with restore directory
Files TMP.dump_dir and TMP.restore_dir are identical
Comparing dump directory with restore directory
+Only in SCRATCH_MNT: .use_space
Files DUMP_DIR/big and RESTORE_DIR/DUMP_SUBDIR/big are identical
Files DUMP_DIR/large000 and RESTORE_DIR/DUMP_SUBDIR/large000 are identical
Files DUMP_DIR/large111 and RESTORE_DIR/DUMP_SUBDIR/large111 are identical
Index: b/062.largefs.out
===================================================================
--- a/062.largefs.out
+++ b/062.largefs.out
@@ -1,6 +1,7 @@
QA output created by 062
*** create test bed
SCRATCH_MNT
+SCRATCH_MNT/.use_space
SCRATCH_MNT/dev
SCRATCH_MNT/dev/b
SCRATCH_MNT/dev/c
@@ -492,6 +493,7 @@ trusted.name3=0xdeface
*** extend test bed
SCRATCH_MNT
+SCRATCH_MNT/.use_space
SCRATCH_MNT/descend
SCRATCH_MNT/descend/and
SCRATCH_MNT/descend/down
Index: b/063.largefs.out
===================================================================
--- a/063.largefs.out
+++ b/063.largefs.out
@@ -19,6 +19,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "stress_063"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: /var/xfsdump/inventory created
@@ -38,7 +39,7 @@ xfsrestore: using online session invento
xfsrestore: searching media for directory dump
xfsrestore: examining media file 0
xfsrestore: reading directories
-xfsrestore: 4 directories and 21 entries processed
+xfsrestore: 4 directories and 22 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
Index: b/064.largefs.out
===================================================================
--- a/064.largefs.out
+++ b/064.largefs.out
@@ -54,6 +54,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "stress_064"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: /var/xfsdump/inventory created
@@ -314,7 +315,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -395,7 +396,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -428,7 +429,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -461,7 +462,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -494,7 +495,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -527,7 +528,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -560,7 +561,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -593,7 +594,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -626,7 +627,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -659,7 +660,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -693,7 +694,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -774,7 +775,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -855,7 +856,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -936,7 +937,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -1017,7 +1018,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -1098,7 +1099,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -1179,7 +1180,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -1260,7 +1261,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -1341,7 +1342,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -1422,7 +1423,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 55 entries processed
+xfsrestore: 2 directories and 56 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
Index: b/065.largefs.out
===================================================================
--- a/065.largefs.out
+++ b/065.largefs.out
@@ -19,6 +19,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "stress_065"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: /var/xfsdump/inventory created
@@ -257,7 +258,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 6 directories and 11 entries processed
+xfsrestore: 6 directories and 12 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -290,7 +291,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 6 entries processed
+xfsrestore: 2 directories and 7 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -317,7 +318,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 4 directories and 7 entries processed
+xfsrestore: 4 directories and 8 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -346,7 +347,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 3 directories and 11 entries processed
+xfsrestore: 3 directories and 12 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -380,7 +381,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 3 directories and 7 entries processed
+xfsrestore: 3 directories and 8 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -410,7 +411,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 5 entries processed
+xfsrestore: 2 directories and 6 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -441,7 +442,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 5 entries processed
+xfsrestore: 2 directories and 6 entries processed
xfsrestore: directory post-processing
xfsrestore: reading non-directory files
xfsrestore: table of contents display complete: SECS seconds elapsed
@@ -525,7 +526,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 6 directories and 11 entries processed
+xfsrestore: 6 directories and 12 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -562,7 +563,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 6 entries processed
+xfsrestore: 2 directories and 7 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -595,7 +596,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 4 directories and 7 entries processed
+xfsrestore: 4 directories and 8 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -628,7 +629,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 3 directories and 11 entries processed
+xfsrestore: 3 directories and 12 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -665,7 +666,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 3 directories and 7 entries processed
+xfsrestore: 3 directories and 8 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -698,7 +699,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 5 entries processed
+xfsrestore: 2 directories and 6 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
@@ -729,7 +730,7 @@ xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
-xfsrestore: 2 directories and 5 entries processed
+xfsrestore: 2 directories and 6 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
Index: b/066.largefs.out
===================================================================
--- a/066.largefs.out
+++ b/066.largefs.out
@@ -12,6 +12,7 @@ xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "stress_066"
xfsdump: ino map <PHASES>
+xfsdump: NOTE: pruned 1 files: skip attribute set
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: /var/xfsdump/inventory created
@@ -31,7 +32,7 @@ xfsrestore: using online session invento
xfsrestore: searching media for directory dump
xfsrestore: examining media file 0
xfsrestore: reading directories
-xfsrestore: 2 directories and 2 entries processed
+xfsrestore: 2 directories and 3 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
Index: b/check
===================================================================
--- a/check
+++ b/check
@@ -269,12 +269,18 @@ do
echo -n " [failed, exit status $sts]"
err=true
fi
- if [ ! -f $seq.out ]
+ if [ "$LARGE_SCRATCH_DEV" = yes ]
+ then
+ outfile=$seq.largefs.out
+ else
+ outfile=$seq.out
+ fi
+ if [ ! -f $outfile ]
then
echo " - no qualified output"
err=true
else
- if diff $seq.out $tmp.out >/dev/null 2>&1
+ if diff $outfile $tmp.out >/dev/null 2>&1
then
if $err
then
@@ -287,7 +293,7 @@ do
else
echo " - output mismatch (see $seq.out.bad)"
mv $tmp.out $seq.out.bad
- $diff $seq.out $seq.out.bad
+ $diff $outfile $seq.out.bad
err=true
fi
fi
Index: b/common.quota
===================================================================
--- a/common.quota
+++ b/common.quota
@@ -161,44 +161,50 @@ _qsetup()
{
# setup exactly what it is we'll be testing
enforce=1
+ if [ "$LARGE_SCRATCH_DEV" = yes ]
+ then
+ outfile=$seq.largefs.out
+ else
+ outfile=$seq.out
+ fi
if src/feature -u $SCRATCH_DEV
then
type=u ;
eval `_choose_uid`
- [ ! -f $seq.out ] && ln -s $seq.usrquota $seq.out
+ [ ! -f $outfile ] && ln -s $seq.usrquota $outfile
elif src/feature -g $SCRATCH_DEV
then
type=g
eval `_choose_gid`
- [ ! -f $seq.out ] && ln -s $seq.grpquota $seq.out
+ [ ! -f $outfile ] && ln -s $seq.grpquota $outfile
elif src/feature -p $SCRATCH_DEV
then
type=p
eval `_choose_prid`
- [ ! -f $seq.out ] && ln -s $seq.prjquota $seq.out
+ [ ! -f $outfile ] && ln -s $seq.prjquota $outfile
elif src/feature -U $SCRATCH_DEV
then
type=u
eval `_choose_uid`
- [ ! -f $seq.out ] && ln -s $seq.uqnoenforce $seq.out
+ [ ! -f $outfile ] && ln -s $seq.uqnoenforce $outfile
enforce=0
elif src/feature -G $SCRATCH_DEV
then
type=g
eval `_choose_gid`
- [ ! -f $seq.out ] && ln -s $seq.gqnoenforce $seq.out
+ [ ! -f $outfile ] && ln -s $seq.gqnoenforce $outfile
enforce=0
elif src/feature -P $SCRATCH_DEV
then
type=p
eval `_choose_prid`
- [ ! -f $seq.out ] && ln -s $seq.pqnoenforce $seq.out
+ [ ! -f $outfile ] && ln -s $seq.pqnoenforce $outfile
enforce=0
else
_notrun "No quota support at mount time"
fi
- echo "Using output from '" `ls -l $seq.out` "'" >>$seq.full
+ echo "Using output from '" `ls -l $outfile` "'" >>$seq.full
echo "and using type=$type id=$id" >>$seq.full
}
|