On Thu, Jan 16, 2025 at 03:27:15PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
>
> Run each test program with a separate session id so that we can tell
> pkill to kill all processes of a given name, but only within our own
> session id. This /should/ suffice to run multiple fstests on the same
> machine without one instance shooting down processes of another
> instance.
>
> This fixes a general problem with using "pkill --parent" -- if the
> process being targeted is not a direct descendant of the bash script
> calling pkill, then pkill will not do anything. The scrub stress tests
> make use of multiple background subshells, which is how a ^C in the
> parent process fails to result in fsx/fsstress being killed.
Yeah, 'pkill --parent' was the best I had managed to come up that
mostly worked, not because it perfect. That was something I wanted
feedback on before merge because it still had problems...
> This is necessary to fix SOAK_DURATION runtime constraints for all the
> scrub stress tests. However, there is a cost -- the test program no
> longer runs with the same controlling tty as ./check, which means that
> ^Z doesn't work and SIGINT/SIGQUIT are set to SIG_IGN. IOWs, if a test
> wants to kill its subprocesses, it must use another signal such as
> SIGPIPE. Fortunately, bash doesn't whine about children dying due to
> fatal signals if the children run in a different session id.
>
> I also explored alternate designs, and this was the least unsatisfying:
>
> a) Setting the process group didn't work because background subshells
> are assigned a new group id.
Yup, tried that.
> b) Constraining the pkill/pgrep search to a cgroup could work, but we'd
> have to set up a cgroup in which to run the fstest.
thought about that, too, and considered if systemd scopes could do
that, but ...
>
> c) Putting test subprocesses in a systemd sub-scope and telling systemd
> to kill the sub-scope could work because ./check can already use it to
> ensure that all child processes of a test are killed. However, this is
> an *optional* feature, which means that we'd have to require systemd.
... requiring systemd was somewhat of a show-stopper for testing
older distros.
> d) Constraining the pkill/pgrep search to a particular mount namespace
> could work, but we already have tests that set up their own mount
> namespaces, which means the constrained pgrep will not find all child
> processes of a test.
*nod*.
> e) Constraining to any other type of namespace (uts, pid, etc) might not
> work because those namespaces might not be enabled.
*nod*
I also tried modifying fsstress to catch and propagate signals and a
couple of other ways of managing processes in the stress code, but
all ended up having significantly worse downsides than using 'pkill
--parent'.
I was aware of session IDs, but I've never used them before and
hadn't gone down the rabbit hole of working out how to use them when
I posted the initial RFC patchset.
> f) Revert check-parallel and go back to one fstests instance per system.
> Zorro already chose not to revert.
>
> So. Change _run_seq to create a the ./$seq process with a new session
> id, update _su calls to use the same session as the parent test, update
> all the pkill sites to use a wrapper so that we only target processes
> created by *this* instance of fstests, and update SIGINT to SIGPIPE.
Yeah, that's definitely cleaner.
.....
> @@ -1173,13 +1173,11 @@ _scratch_xfs_stress_scrub_cleanup() {
> rm -f "$runningfile"
> echo "Cleaning up scrub stress run at $(date)" >> $seqres.full
>
> - # Send SIGINT so that bash won't print a 'Terminated' message that
> - # distorts the golden output.
> echo "Killing stressor processes at $(date)" >> $seqres.full
> - _kill_fsstress
> - pkill -INT --parent $$ xfs_io >> $seqres.full 2>&1
> - pkill -INT --parent $$ fsx >> $seqres.full 2>&1
> - pkill -INT --parent $$ xfs_scrub >> $seqres.full 2>&1
> + _pkill --echo -PIPE fsstress >> $seqres.full 2>&1
> + _pkill --echo -PIPE xfs_io >> $seqres.full 2>&1
> + _pkill --echo -PIPE fsx >> $seqres.full 2>&1
> + _pkill --echo -PIPE xfs_scrub >> $seqres.full 2>&1
Removing _kill_fsstress is wrong - the fsstress process has already
been renamed, so open coding 'pkill fsstress' may not match. The
_kill_fsstress() code gets changed to do the right thing here:
> @@ -69,7 +75,7 @@ _kill_fsstress()
> if [ -n "$_FSSTRESS_PID" ]; then
> # use SIGPIPE to avoid "Killed" messages from bash
> echo "killing $_FSSTRESS_BIN" >> $seqres.full
> - pkill -PIPE $_FSSTRESS_BIN >> $seqres.full 2>&1
> + _pkill -PIPE $_FSSTRESS_BIN >> $seqres.full 2>&1
> _wait_for_fsstress
> return $?
> fi
Then in the next patch when the _FSSTRESS_BIN workaround goes away,
_kill_fsstress() is exactly what you open coded in
_scratch_xfs_stress_scrub_cleanup()....
i.e. common/fuzzy really shouldn't open code the fsstress process
management - it should use the wrapper like everything else does.
Everything else in the patch looks good.
-Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
