Skip to contentSkip to conversation

xfs/654: don't complain if the healthmon xfs_io already exited

PATCH In review Avinesh Kumar 3 participants 3 messages Nov 11 – Nov 14

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs/654: don't complain if the healthmon xfs_io already exited

From: Avinesh Kumar <[email protected]>

After the unmount, the test resumes the stopped xfs_io healthmon process, which reads the "filesystem unmounted" event, sees EOF, and exits on its own. The test then sends it a SIGTERM anyway in case it did not exit. If xfs_io has already exited and been reaped by the shell, kill prints "kill: (PID) - No such process" to stderr, which doesn't match the golden output:

+/opt/xfstests/tests/xfs/654: line 50: kill: (170710) - No such process
mount refcount is in range
mount + healthmon refcount is in range

Redirect kill's output to $seqres.full, as _kill_xfs_healer does.

Fixes 79f6b1c3 ("xfs: test health monitoring code")
---
 tests/xfs/654 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/xfs/654 +1 -1
index 012f31a8..e8d815ae 100755
@@ -47,7 +47,7 @@ mon_nomount_refcount="$(_module_refcount xfs)"
 # Capture mod refcount after continuing healthmon (which should exit due to the
 # unmount) and killing it.
 kill -CONT $healer_pid
-kill $healer_pid
+kill $healer_pid &>> $seqres.full
 wait
 unset healer_pid
 nomon_nomount_refcount="$(_module_refcount xfs)"
Signature · 1 line
2.56.0
Reviewed-by on v1 1/1
#2 lore raw
In reply to Avinesh Kumar
Quoted 13 lines · Avinesh Kumar

From: Avinesh Kumar <[email protected]>

After the unmount, the test resumes the stopped xfs_io healthmon process, which reads the "filesystem unmounted" event, sees EOF, and exits on its own. The test then sends it a SIGTERM anyway in case it did not exit. If xfs_io has already exited and been reaped by the shell, kill prints "kill: (PID) - No such process" to stderr, which doesn't match the golden output:

+/opt/xfstests/tests/xfs/654: line 50: kill: (170710) - No such process
mount refcount is in range
mount + healthmon refcount is in range

Quoted 5 lines

Redirect kill's output to $seqres.full, as _kill_xfs_healer does.

Fixes 79f6b1c3 ("xfs: test health monitoring code")

---

Quoted 20 lines
 tests/xfs/654 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/xfs/654 +1 -1
index 012f31a8..e8d815ae 100755
@@ -47,7 +47,7 @@ mon_nomount_refcount="$(_module_refcount xfs)"
 # Capture mod refcount after continuing healthmon (which should exit due to the
 # unmount) and killing it.
 kill -CONT $healer_pid
-kill $healer_pid
+kill $healer_pid &>> $seqres.full
 wait
 unset healer_pid
 nomon_nomount_refcount="$(_module_refcount xfs)"
Signature · 1 line
2.56.0