From nobody Sat Nov 15 12:44:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595261154; cv=none; d=zohomail.com; s=zohoarc; b=ac4Suh4vb+5LVkrWXBQiZk+RNn3tI4DW9dSYkqqOxpMI6UNSmuSJSONcZ8kfDk6LY5JaFzhg+QltEFzfe+bxth6MRE7evWyZu2Zc/Koc5382O1IrX3ojDn7KVXAijtx9uGTGJUVXspdx/6wz24xellAOJpY95FYM/nJsvssR6CQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595261154; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NkjD66WGtZfhbipYtEcVUAhkxQe/HWyUoUbFUyKqxGU=; b=H7W09aHlWucbWLIU8/waX4dAvojPqzsr55Xx1DQFBfJumDsPjXY70nZjmloHmEOnscR7Hz3gP408x7S7iCBIorrZmvnFskbqCiTXAVt40++gHrt27VDJTB96pJWMQlqe/tKzS8UtD4lCiA5LMxxFvGRasG+3NMstZFBIs7T8RdQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595261154657866.7969870034225; Mon, 20 Jul 2020 09:05:54 -0700 (PDT) Received: from localhost ([::1]:60356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxYIb-0005c2-Io for importer@patchew.org; Mon, 20 Jul 2020 12:05:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxYFs-00031a-6D for qemu-devel@nongnu.org; Mon, 20 Jul 2020 12:03:04 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26715 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jxYFo-0002Ej-Gy for qemu-devel@nongnu.org; Mon, 20 Jul 2020 12:03:03 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-473-mQtgWl70PsKVTRxIYoGPIQ-1; Mon, 20 Jul 2020 12:02:56 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6ECDF100CC85; Mon, 20 Jul 2020 16:02:55 +0000 (UTC) Received: from ibm-p8-OVS-01-fsp.mgmt.pnr.lab.eng.rdu2.redhat.com (ovpn-120-206.rdu2.redhat.com [10.10.120.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BE7D5C66E; Mon, 20 Jul 2020 16:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595260978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NkjD66WGtZfhbipYtEcVUAhkxQe/HWyUoUbFUyKqxGU=; b=AdyQ6L+bAMHN3ZiHRebNaSMzZYQ3Ytj74+bVTeS4VWMcna+QYp5DWFFfouwu2RLv4TG/b9 29tAVx1Hf46yqziU3DGsNiU5BoRhsg8Nlbr0Wf6QaJyojwX/08GUI2EgFjMJoTJ9PACOZP q7heM7boMNZ44dbQ0bD/lLx5CuWQIWE= X-MC-Unique: mQtgWl70PsKVTRxIYoGPIQ-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 1/1] python/machine: Change default timeout to 30 seconds Date: Mon, 20 Jul 2020 12:02:52 -0400 Message-Id: <20200720160252.104139-2-jsnow@redhat.com> In-Reply-To: <20200720160252.104139-1-jsnow@redhat.com> References: <20200720160252.104139-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=jsnow@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/20 03:17:01 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, Eduardo Habkost , philmd@redhat.com, Cleber Rosa , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 3 seconds is too short for some tests running inside busy VMs. Build it out= to a rather generous 30 seconds to find out conclusively if there are more sev= ere problems in the merge/CI tests. Signed-off-by: John Snow Reviewed-by: Eduardo Habkost --- python/qemu/machine.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 80c4d4a8b6..51aa255ef9 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -394,15 +394,15 @@ def _hard_shutdown(self) -> None: self._popen.kill() self._popen.wait(timeout=3D60) =20 - def _soft_shutdown(self, has_quit: bool =3D False, - timeout: Optional[int] =3D 3) -> None: + def _soft_shutdown(self, timeout: Optional[int], + has_quit: bool =3D False) -> None: """ Perform early cleanup, attempt to gracefully shut down the VM, and= wait for it to terminate. =20 + :param timeout: Timeout in seconds for graceful shutdown. + A value of None is an infinite wait. :param has_quit: When True, don't attempt to issue 'quit' QMP comm= and - :param timeout: Optional timeout in seconds for graceful shutdown. - Default 3 seconds, A value of None is an infinite = wait. =20 :raise ConnectionReset: On QMP communication errors :raise subprocess.TimeoutExpired: When timeout is exceeded waiting= for @@ -418,14 +418,14 @@ def _soft_shutdown(self, has_quit: bool =3D False, # May raise subprocess.TimeoutExpired self._popen.wait(timeout=3Dtimeout) =20 - def _do_shutdown(self, has_quit: bool =3D False, - timeout: Optional[int] =3D 3) -> None: + def _do_shutdown(self, timeout: Optional[int], + has_quit: bool =3D False) -> None: """ Attempt to shutdown the VM gracefully; fallback to a hard shutdown. =20 + :param timeout: Timeout in seconds for graceful shutdown. + A value of None is an infinite wait. :param has_quit: When True, don't attempt to issue 'quit' QMP comm= and - :param timeout: Optional timeout in seconds for graceful shutdown. - Default 3 seconds, A value of None is an infinite = wait. =20 :raise AbnormalShutdown: When the VM could not be shut down gracef= ully. The inner exception will likely be ConnectionReset or @@ -433,7 +433,7 @@ def _do_shutdown(self, has_quit: bool =3D False, may result in its own exceptions, likely subprocess.TimeoutExp= ired. """ try: - self._soft_shutdown(has_quit, timeout) + self._soft_shutdown(timeout, has_quit) except Exception as exc: self._hard_shutdown() raise AbnormalShutdown("Could not perform graceful shutdown") \ @@ -441,7 +441,7 @@ def _do_shutdown(self, has_quit: bool =3D False, =20 def shutdown(self, has_quit: bool =3D False, hard: bool =3D False, - timeout: Optional[int] =3D 3) -> None: + timeout: Optional[int] =3D 30) -> None: """ Terminate the VM (gracefully if possible) and perform cleanup. Cleanup will always be performed. @@ -453,7 +453,7 @@ def shutdown(self, has_quit: bool =3D False, :param hard: When true, do not attempt graceful shutdown, and suppress the SIGKILL warning log message. :param timeout: Optional timeout in seconds for graceful shutdown. - Default 3 seconds, A value of None is an infinite = wait. + Default 30 seconds, A `None` value is an infinite = wait. """ if not self._launched: return @@ -463,7 +463,7 @@ def shutdown(self, has_quit: bool =3D False, self._user_killed =3D True self._hard_shutdown() else: - self._do_shutdown(has_quit, timeout=3Dtimeout) + self._do_shutdown(timeout, has_quit) finally: self._post_shutdown() =20 @@ -473,12 +473,12 @@ def kill(self): """ self.shutdown(hard=3DTrue) =20 - def wait(self, timeout: Optional[int] =3D 3) -> None: + def wait(self, timeout: Optional[int] =3D 30) -> None: """ Wait for the VM to power off and perform post-shutdown cleanup. =20 - :param timeout: Optional timeout in seconds. - Default 3 seconds, A value of None is an infinite = wait. + :param timeout: Optional timeout in seconds. Default 30 seconds. + A value of `None` is an infinite wait. """ self.shutdown(has_quit=3DTrue, timeout=3Dtimeout) =20 --=20 2.26.2