From nobody Fri May 3 09:52:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518531461628156.75199024984897; Tue, 13 Feb 2018 06:17:41 -0800 (PST) Received: from localhost ([::1]:37898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elbOu-0006ga-PT for importer@patchew.org; Tue, 13 Feb 2018 09:17:40 -0500 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) Received: from thh440s.redhat.com (ovpn-116-144.ams2.redhat.com [10.36.116.144]) by smtp.corp.redhat.com (Postfix) with ESMTP id 11D69217B400; Tue, 13 Feb 2018 14:14:39 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 13 Feb 2018 15:14:39 +0100 Message-Id: <1518531279-11966-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 13 Feb 2018 14:14:45 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 13 Feb 2018 14:14:45 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] io/channel-command: Delay the killing of the child after closing the pipe X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= , Cornelia Huck , "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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(QIOChannelComman= d *ioc, return -1; } } else if (ret =3D=3D 0) { - if (step =3D=3D 0) { + if (step =3D=3D 4) { kill(ioc->pid, SIGTERM); - } else if (step =3D=3D 1) { + } else if (step =3D=3D 8) { kill(ioc->pid, SIGKILL); - } else { + } else if (step >=3D 9) { error_setg(errp, "Process %llu refused to die", (unsigned long long)ioc->pid); --=20 1.8.3.1