isolate a fix from PR #524 to fix worker crash on job cancel
parent
94ca9c1879
commit
c75b1b0e5b
@ -0,0 +1,29 @@
|
|||||||
|
From 5e04cf7f0e34eaba2884bf70e3f0a93165bad28e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Williamson <awilliam@redhat.com>
|
||||||
|
Date: Mon, 4 Jul 2016 23:48:22 -0700
|
||||||
|
Subject: [PATCH] Stop the vm on signal handler (i.e. during worker cancel)
|
||||||
|
|
||||||
|
This is like:
|
||||||
|
https://github.com/os-autoinst/os-autoinst/pull/524/commits/4d9a31f
|
||||||
|
but without the changes that don't apply to current git master,
|
||||||
|
as a temporary fix for #530 (which we're hitting on Fedora
|
||||||
|
deployments).
|
||||||
|
---
|
||||||
|
isotovideo | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/isotovideo b/isotovideo
|
||||||
|
index fd5aac6..1ced6f1 100755
|
||||||
|
--- a/isotovideo
|
||||||
|
+++ b/isotovideo
|
||||||
|
@@ -85,6 +85,7 @@ sub signalhandler {
|
||||||
|
$autotest::running->fail_if_running();
|
||||||
|
$autotest::running = undef;
|
||||||
|
}
|
||||||
|
+ bmwqemu::stop_vm();
|
||||||
|
if (defined $backend && $backend->{backend_pid}) {
|
||||||
|
diag("$$: killing backend process $backend->{backend_pid}");
|
||||||
|
kill('SIGTERM', $backend->{backend_pid});
|
||||||
|
--
|
||||||
|
2.9.0
|
||||||
|
|
Loading…
Reference in new issue