[4/8] dump: don't fail if multi-file dumps don't all contain quota info
diff mbox series

Message ID 154111436733.6577.618179444183829859.stgit@magnolia
State Accepted
Headers show
Series
  • fstests: fix quota failures on xfs
Related show

Commit Message

Darrick J. Wong Nov. 1, 2018, 11:19 p.m. UTC
From: Darrick J. Wong <darrick.wong@oracle.com>

When xfsdump is making multi-file dumps, the quota information are
written into the last dump file.  However, the multi-file restore script
(as written) expects to see quota information restored by every dump
file and fails.  This is silly, so fix it.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 common/dump |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Patch
diff mbox series

diff --git a/common/dump b/common/dump
index b6b7fb46..c45b8a5a 100644
--- a/common/dump
+++ b/common/dump
@@ -1432,16 +1432,19 @@  _check_quota()
 			    print "Found extra:", $0
 			}
 			next
+	}
+	$0 ~ "Restore Status: INCOMPLETE" {
+			incomplete = 1
 	}
 			{ print }
 	END {
-		if (uquota && !found_uquota) {
+		if (uquota && !found_uquota && !incomplete) {
 		    print "Missing user quota msg:", usermsg
 		}
-		if (gquota && !found_gquota) {
+		if (gquota && !found_gquota && !incomplete) {
 		    print "Missing group quota msg:", groupmsg
 		}
-		if (pquota && !found_pquota) {
+		if (pquota && !found_pquota && !incomplete) {
 		    print "Missing project quota msg:", projectmsg
 		}
 	}