| Message ID | 150836986903.27213.7461698055714662108.stgit@magnolia (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Oct 18, 2017 at 04:37:49PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Make the xfs_scrub output that gets recorded to $seqres.full follow the > format of xfs_repair checks. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > common/xfs | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > > diff --git a/common/xfs b/common/xfs > index 7d8f275..25c2ce9 100644 > --- a/common/xfs > +++ b/common/xfs > @@ -356,11 +356,15 @@ _check_xfs_filesystem() > # Run online scrub if we can. > mntpt="$(_is_mounted $device)" > if [ -n "$mntpt" ] && _supports_xfs_scrub "$mntpt" "$device"; then > - "$XFS_SCRUB_PROG" $scrubflag -v -d -n $device >>$seqres.full > + "$XFS_SCRUB_PROG" $scrubflag -v -d -n $device > $tmp.scrub 2>&1 Ahh, you dumped stderr to $tmp.scrub here, that's fine too :) Eryu > if [ $? -ne 0 ]; then > - _log_err "filesystem on $device failed scrub" > + _log_err "_check_xfs_filesystem: filesystem on $device failed scrub" > + echo "*** xfs_scrub $scrubflag -v -d -n output ***" >> $seqres.full > + cat $tmp.scrub >> $seqres.full > + echo "*** end xfs_scrub output" >> $serqres.full > ok=0 > fi > + rm -f $tmp.scrub > fi > > if [ "$type" = "xfs" ]; then > -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/common/xfs b/common/xfs index 7d8f275..25c2ce9 100644 --- a/common/xfs +++ b/common/xfs @@ -356,11 +356,15 @@ _check_xfs_filesystem() # Run online scrub if we can. mntpt="$(_is_mounted $device)" if [ -n "$mntpt" ] && _supports_xfs_scrub "$mntpt" "$device"; then - "$XFS_SCRUB_PROG" $scrubflag -v -d -n $device >>$seqres.full + "$XFS_SCRUB_PROG" $scrubflag -v -d -n $device > $tmp.scrub 2>&1 if [ $? -ne 0 ]; then - _log_err "filesystem on $device failed scrub" + _log_err "_check_xfs_filesystem: filesystem on $device failed scrub" + echo "*** xfs_scrub $scrubflag -v -d -n output ***" >> $seqres.full + cat $tmp.scrub >> $seqres.full + echo "*** end xfs_scrub output" >> $serqres.full ok=0 fi + rm -f $tmp.scrub fi if [ "$type" = "xfs" ]; then