xCAT/xcat-dep
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-dep.git synced 2026-09-12 12:36:23 +00:00
Code Issues Projects Releases Wiki Activity

fix(xcat-dep): give an unbounded build its own process group

Browse Source 
With no deadline the helper called system(), which leaves the build in the
orchestrator's process group and installs no signal handler. A cancellation
then killed the orchestrator, which released its locks while the build kept
writing into staging, and a build killed by a signal was reported as rc=0.
Both paths now fork; a timeout of 0 removes the deadline, nothing else.
This commit is contained in:
Vinícius Ferrão
2026-09-06 01:44:31 -03:00
parent 286a63d6f4
commit 7fc348eb09
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/XCAT/BuildUtils.pm
+5 -8
View File
@@ -205,7 +205,7 @@ sub stall_report {
# The command runs in its own process group: a build spawns schroot, mock, qemu and make, and only a
# group signal reaches all of them. Signalling the group also means no child survives holding the
# caller's stdout open, which would turn the timeout back into a hang one level up.
# %a: cmd (required), timeout (seconds; <=0 runs unbounded), label, sample, out
# %a: cmd (required), timeout (seconds; <=0 runs without a deadline), label, sample, out
# Returns { ec, timed_out, elapsed }. ec is 124 on a timeout, matching timeout(1).
sub run_bounded {
my (%a) = @_;
@@ -215,11 +215,6 @@ sub run_bounded {
my $out = $a{out} || \*STDERR;
my $t0 = time;
if ($timeout <= 0) {
my $rc = system('bash', '-c', $cmd);
return { ec => ($rc == -1 ? -1 : $rc >> 8), timed_out => 0, elapsed => time - $t0 };
}
my $pid = fork();
die "run_bounded: fork failed: $!\n" unless defined $pid;
if ($pid == 0) {
@@ -253,14 +248,16 @@ sub run_bounded {
local $SIG{TERM} = $forward;
local $SIG{HUP} = $forward;
my $deadline = $t0 + $timeout;
# An unbounded run still forks: it is the process group, not the deadline, that lets a signal
# to the orchestrator reach the build.
my $deadline = $timeout > 0 ? $t0 + $timeout : undef;
my $timed_out = 0;
my $status;
while (1) {
my $r = waitpid($pid, POSIX::WNOHANG());
if ($r == $pid) { $status = $?; last; }
if ($r == -1) { $status = 0; last; }
if (time >= $deadline) { $timed_out = 1; last; }
if (defined $deadline and time >= $deadline) { $timed_out = 1; last; }
Time::HiRes::sleep(0.5);
}