From: Darrick J. Wong <djwong@xxxxxxxxxx>
The XFS metadump file format doesn't support the capture of external log
devices, which means that mdrestore ought to wipe the external log and
run xfs_repair to rewrite the log device as needed to get the restored
filesystem to work again. The common/populate code could already do
this, so push it to the common xfs helper.
While we're at it, fix the uncareful usage of SCRATCH_LOGDEV in the
populate code.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
common/fuzzy | 7 ++++++-
common/populate | 19 ++++++-------------
common/xfs | 21 +++++++++++++++++++--
3 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/common/fuzzy b/common/fuzzy
index ef54f2fe2c..7034ff8c42 100644
--- a/common/fuzzy
+++ b/common/fuzzy
@@ -297,7 +297,12 @@ __scratch_xfs_fuzz_unmount()
__scratch_xfs_fuzz_mdrestore()
{
__scratch_xfs_fuzz_unmount
- _xfs_mdrestore "${POPULATE_METADUMP}" "${SCRATCH_DEV}" || \
+
+ local logdev=none
+ [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
+ logdev=$SCRATCH_LOGDEV
+
+ _xfs_mdrestore "${POPULATE_METADUMP}" "${SCRATCH_DEV}" "${logdev}" || \
_fail "${POPULATE_METADUMP}: Could not find metadump to restore?"
}
diff --git a/common/populate b/common/populate
index 8db7acefb6..08c4bdc151 100644
--- a/common/populate
+++ b/common/populate
@@ -902,21 +902,14 @@ _scratch_populate_cache_tag() {
_scratch_populate_restore_cached() {
local metadump="$1"
+ local logdev=none
+ [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
+ logdev=$SCRATCH_LOGDEV
+
case "${FSTYP}" in
"xfs")
- _xfs_mdrestore "${metadump}" "${SCRATCH_DEV}"
- res=$?
- test $res -ne 0 && return $res
-
- # Cached images should have been unmounted cleanly, so if
- # there's an external log we need to wipe it and run repair to
- # format it to match this filesystem.
- if [ -n "${SCRATCH_LOGDEV}" ]; then
- $WIPEFS_PROG -a "${SCRATCH_LOGDEV}"
- _scratch_xfs_repair
- res=$?
- fi
- return $res
+ _xfs_mdrestore "${metadump}" "${SCRATCH_DEV}" "${logdev}"
+ return $?
;;
"ext2"|"ext3"|"ext4")
_ext4_mdrestore "${metadump}" "${SCRATCH_DEV}"
diff --git a/common/xfs b/common/xfs
index 77af8a6d60..29130fabbc 100644
--- a/common/xfs
+++ b/common/xfs
@@ -682,7 +682,8 @@ _xfs_metadump() {
_xfs_mdrestore() {
local metadump="$1"
local device="$2"
- shift; shift
+ local logdev="$3"
+ shift; shift; shift
local options="$@"
# If we're configured for compressed dumps and there isn't already an
@@ -696,6 +697,18 @@ _xfs_mdrestore() {
test -r "$metadump" || return 1
$XFS_MDRESTORE_PROG $options "${metadump}" "${device}"
+ res=$?
+ test $res -ne 0 && return $res
+
+ # Cached images should have been unmounted cleanly, so if there's an
+ # external log we need to wipe it and run repair to format it to match
+ # this filesystem.
+ if [ "${logdev}" != "none" ]; then
+ $WIPEFS_PROG -a "${logdev}"
+ _scratch_xfs_repair
+ res=$?
+ fi
+ return $res
}
# Snapshot the metadata on the scratch device
@@ -717,7 +730,11 @@ _scratch_xfs_mdrestore()
local metadump=$1
shift
- _xfs_mdrestore "$metadump" "$SCRATCH_DEV" "$@"
+ local logdev=none
+ [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
+ logdev=$SCRATCH_LOGDEV
+
+ _xfs_mdrestore "$metadump" "$SCRATCH_DEV" "$logdev" "$@"
}
# run xfs_check and friends on a FS.
