From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: guaneryu@gmail.com, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org
Subject: [PATCH 4/8] dump: don't fail if multi-file dumps don't all contain quota info
Date: Thu, 01 Nov 2018 16:19:27 -0700 [thread overview]
Message-ID: <154111436733.6577.618179444183829859.stgit@magnolia> (raw)
In-Reply-To: <154111434286.6577.15010861884505931015.stgit@magnolia>
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(-)
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
}
}
next prev parent reply other threads:[~2018-11-02 8:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-01 23:19 [PATCH 0/8] fstests: fix quota failures on xfs Darrick J. Wong
2018-11-01 23:19 ` [PATCH 1/8] quota: clean out speculative preallocations when checking quota usage Darrick J. Wong
2018-11-01 23:19 ` [PATCH 2/8] xfs: force unlink metadata updates to disk Darrick J. Wong
2018-11-01 23:19 ` [PATCH 3/8] generic/050: fix ro blockdev mount of xfs with quota Darrick J. Wong
2018-11-04 15:32 ` Eryu Guan
2018-11-27 23:19 ` Darrick J. Wong
2018-11-28 3:03 ` Eryu Guan
2018-11-28 3:41 ` Darrick J. Wong
2018-11-01 23:19 ` Darrick J. Wong [this message]
2018-11-01 23:19 ` [PATCH 5/8] xfs/266: fix restore summary counter when quotas are enabled Darrick J. Wong
2018-11-01 23:19 ` [PATCH 6/8] xfs/205: update for v5 filesystems Darrick J. Wong
2018-11-01 23:19 ` [PATCH 7/8] misc: force the exact quota options coded into the test Darrick J. Wong
2018-11-01 23:19 ` [PATCH 8/8] xfs: filter out mount options that don't work on v4 filesystems Darrick J. Wong
2018-11-04 16:01 ` [PATCH 0/8] fstests: fix quota failures on xfs Eryu Guan
2018-11-06 4:54 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=154111436733.6577.618179444183829859.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=fstests@vger.kernel.org \
--cc=guaneryu@gmail.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox