mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
common/xfs: work around a hang-on-stdin bug in xfs_admin 5.11
xfs_admin in xfsprogs 5.11 has a bug wherein a caller who specifies an external log device forces xfs_db to be invoked, potentially with zero command arguments. When this happens, xfs_db will wait for input on stdin, which causes fstests to hang. Since xfs_admin is not an interactive tool, redirect stdin from /dev/null to prevent this issue. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
committed by
Eryu Guan
parent
3750c2698d
commit
e3b376a168
+7
-1
@@ -277,7 +277,13 @@ _scratch_xfs_admin()
|
||||
_notrun 'xfs_admin does not support rt devices'
|
||||
rt_opts+=(-r "$SCRATCH_RTDEV")
|
||||
fi
|
||||
$XFS_ADMIN_PROG "${rt_opts[@]}" "$@" "${options[@]}"
|
||||
|
||||
# xfs_admin in xfsprogs 5.11 has a bug where an external log device
|
||||
# forces xfs_db to be invoked, potentially with zero command arguments.
|
||||
# When this happens, xfs_db will wait for input on stdin, which causes
|
||||
# fstests to hang. Since xfs_admin is not an interactive tool, we
|
||||
# can redirect stdin from /dev/null to prevent this issue.
|
||||
$XFS_ADMIN_PROG "${rt_opts[@]}" "$@" "${options[@]}" < /dev/null
|
||||
}
|
||||
|
||||
_scratch_xfs_logprint()
|
||||
|
||||
Reference in New Issue
Block a user