From b1ac40b8dc258160f1dabd6b9bd2bc2247a05993 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 31 May 2018 09:00:02 +0000 Subject: [PATCH] restore: do not kill restored process on failure While trying to resurrect the test cases in test/other/rpc one test case was checking for returned errors during restore failures. The process was dumping itself and while the process kept on running it tried to restore from that checkpoint. That should fail as the PID is in use of the process doing the test. CRIU, however, killed the test process during restore failure. This is the fix as proposed by Andrei Vagin on the CRIU mailing list. Signed-off-by: Adrian Reber Signed-off-by: Andrei Vagin --- criu/cr-restore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/criu/cr-restore.c b/criu/cr-restore.c index e969c24cd..3564a9b60 100644 --- a/criu/cr-restore.c +++ b/criu/cr-restore.c @@ -2556,8 +2556,8 @@ out_kill: struct pstree_item *pi; for_each_pstree_item(pi) - if (vpid(pi) > 0) - kill(vpid(pi), SIGKILL); + if (pi->pid->real > 0) + kill(pi->pid->real, SIGKILL); } out: