aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2016-01-11 13:00:36 +0000
committerDaniel P. Berrange <berrange@redhat.com>2016-01-19 14:03:27 +0000
commit0c0a55b229bb6d61408394766bcbb04beecd5fa5 (patch)
treece9c11f56d00ae36c07f7e97ed18977416e4916c
parentcc75a50c68ccea2068e76fc59e5492899abd3bdb (diff)
io: increment counter when killing off subcommand
When killing the subcommand, it is intended to first send SIGTERM, then SIGKILL and only report an error if it still doesn't die after SIGKILL. The 'step' counter was not being incremented though, so the code never got past the SIGTERM stage. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-rw-r--r--io/channel-command.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/io/channel-command.c b/io/channel-command.c
index 598fdab5a3..a220fe886b 100644
--- a/io/channel-command.c
+++ b/io/channel-command.c
@@ -179,6 +179,7 @@ static int qio_channel_command_abort(QIOChannelCommand *ioc,
(unsigned long long)ioc->pid);
return -1;
}
+ step++;
usleep(10 * 1000);
goto rewait;
}