Skip to content

Commit bb8144f

Browse files
committed
Revert "ignore stale qemu.pid files" and give isotovideo more time
to kill qemu - we'll see
1 parent 7112b80 commit bb8144f

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Diff for: lib/OpenQA/Worker/Engines/isotovideo.pm

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ sub set_engine_exec {
4040
sub _kill($) {
4141
my ($pid) = @_;
4242
my $n = kill(SIGTERM, $pid);
43-
for (my $i = 0; $n && $i < 5; ++$i) {
44-
sleep 1;
43+
for (my $i = 0; $n && $i < 10; ++$i) {
44+
sleep 3;
4545
$n = kill(SIGTERM, $pid);
46+
warn "kill TERM resulted in $n";
4647
}
4748
if ($n) {
4849
warn "pid $pid didn't die, sending KILL";

Diff for: lib/OpenQA/Worker/Pool.pm

+4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ sub lockit(){
4343

4444
sub clean_pool(){
4545
return if $nocleanup;
46+
if (-e "$pooldir/qemu.pid") {
47+
print "QEMU should be dead - WASUP?\n";
48+
exit(1);
49+
}
4650
for my $file (<$pooldir/*>) {
4751
if (-d $file) {
4852
remove_tree($file);

0 commit comments

Comments
 (0)