From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elbMK-00050x-Fh for qemu-devel@nongnu.org; Tue, 13 Feb 2018 09:15:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elbMH-0007a9-80 for qemu-devel@nongnu.org; Tue, 13 Feb 2018 09:15:00 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51816 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1elbMH-0007W2-3B for qemu-devel@nongnu.org; Tue, 13 Feb 2018 09:14:57 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B1E4F40FB64A for ; Tue, 13 Feb 2018 14:14:45 +0000 (UTC) From: Thomas Huth Date: Tue, 13 Feb 2018 15:14:39 +0100 Message-Id: <1518531279-11966-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH] io/channel-command: Delay the killing of the child after closing the pipe List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Cc: "Dr. David Alan Gilbert" , Juan Quintela , =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= , Cornelia Huck We are currently facing some migration failure on s390x when running certain avocado tests, e.g. when running the test type_specific.io-github-autotest-qemu.migrate.with_reboot.exec.gzip_exec. This test is using 'migrate -d "exec:nc localhost 5200"' for the migration. The problem is detected at the receiving side, where the migration stream apparently ends too early. However, the cause for the problem is the sending side: After writing the migration stream into the pipe to netcat, the source QEMU calls qio_channel_command_close() which closes the pipe and immediately (!) kills the child process afterwards. So if the sending netcat did not read the final bytes from the pipe yet, or if it did not manage to send out all its buffers yet, it is killed before the whole migration stream is passed to the destination side. To ease the situation at least a little bit, we should give the child process at least some few more time slices before we kill it with SIGTERM and then with SIGKILL. With this change, the avocado test now succeeds here in 10 out of 10 runs. Signed-off-by: Thomas Huth --- io/channel-command.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/io/channel-command.c b/io/channel-command.c index 319c5ed..f64db3e 100644 --- a/io/channel-command.c +++ b/io/channel-command.c @@ -177,11 +177,11 @@ static int qio_channel_command_abort(QIOChannelCommand *ioc, return -1; } } else if (ret == 0) { - if (step == 0) { + if (step == 4) { kill(ioc->pid, SIGTERM); - } else if (step == 1) { + } else if (step == 8) { kill(ioc->pid, SIGKILL); - } else { + } else if (step >= 9) { error_setg(errp, "Process %llu refused to die", (unsigned long long)ioc->pid); -- 1.8.3.1