[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/7] scripts: set timeout when waiting for qemu monit
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PULL 5/7] scripts: set timeout when waiting for qemu monitor connection |
Date: |
Fri, 22 Jul 2016 13:30:51 +0530 |
From: "Daniel P. Berrange" <address@hidden>
If QEMU fails to launch for some reason, the QEMUMonitorProtocol
class accept() method will wait forever in a socket accept call.
Set a timeout of 15 seconds so that we fail more gracefully
instead of hanging the test script forever
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>
---
scripts/qmp/qmp.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py
index 70e927e..2d0d926 100644
--- a/scripts/qmp/qmp.py
+++ b/scripts/qmp/qmp.py
@@ -140,6 +140,7 @@ class QEMUMonitorProtocol:
@raise QMPConnectError if the greeting is not received
@raise QMPCapabilitiesError if fails to negotiate capabilities
"""
+ self.__sock.settimeout(15)
self.__sock, _ = self.__sock.accept()
self.__sockfile = self.__sock.makefile()
return self.__negotiate_capabilities()
--
2.7.4
- [Qemu-devel] [PULL 0/7] migration: fix, perf testing framework, Amit Shah, 2016/07/22
- [Qemu-devel] [PULL 1/7] migration: set state to post-migrate on failure, Amit Shah, 2016/07/22
- [Qemu-devel] [PULL 2/7] scripts: add __init__.py file to scripts/qmp/, Amit Shah, 2016/07/22
- [Qemu-devel] [PULL 3/7] scripts: add a 'debug' parameter to QEMUMonitorProtocol, Amit Shah, 2016/07/22
- [Qemu-devel] [PULL 4/7] scripts: refactor the VM class in iotests for reuse, Amit Shah, 2016/07/22
- [Qemu-devel] [PULL 5/7] scripts: set timeout when waiting for qemu monitor connection,
Amit Shah <=
- [Qemu-devel] [PULL 6/7] scripts: ensure monitor socket has SO_REUSEADDR set, Amit Shah, 2016/07/22
- [Qemu-devel] [PULL 7/7] tests: introduce a framework for testing migration performance, Amit Shah, 2016/07/22
- Re: [Qemu-devel] [PULL 0/7] migration: fix, perf testing framework, Peter Maydell, 2016/07/22