[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/22] tests/migration: fix unix socket migration
From: |
Daniel P . Berrangé |
Subject: |
[PULL 22/22] tests/migration: fix unix socket migration |
Date: |
Mon, 12 Jul 2021 14:02:23 +0100 |
From: Hyman <huangy81@chinatelecom.cn>
The test aborts and error message as the following be throwed:
"No such file or directory: '/var/tmp/qemu-migrate-{pid}.migrate",
when the unix socket migration test nearly done. The reason is
qemu removes the unix socket file after migration before
guestperf.py script do it. So pre-check if the socket file exists
when removing it to prevent the guestperf program from aborting.
See also commit f9cc00346d3 ("tests/migration: fix unix socket batch
migration").
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Signed-off-by: Hyman <huangy81@chinatelecom.cn>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/migration/guestperf/engine.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/migration/guestperf/engine.py
b/tests/migration/guestperf/engine.py
index 7c991c4407..87a6ab2009 100644
--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
@@ -423,7 +423,7 @@ def run(self, hardware, scenario, result_dir=os.getcwd()):
progress_history = ret[0]
qemu_timings = ret[1]
vcpu_timings = ret[2]
- if uri[0:5] == "unix:":
+ if uri[0:5] == "unix:" and os.path.exists(uri[5:]):
os.remove(uri[5:])
if os.path.exists(srcmonaddr):
--
2.31.1
- [PULL 12/22] crypto: flip priority of backends to prefer gcrypt, (continued)
- [PULL 12/22] crypto: flip priority of backends to prefer gcrypt, Daniel P . Berrangé, 2021/07/12
- [PULL 13/22] crypto: introduce build system for gnutls crypto backend, Daniel P . Berrangé, 2021/07/12
- [PULL 14/22] crypto: add gnutls cipher provider, Daniel P . Berrangé, 2021/07/12
- [PULL 15/22] crypto: add gnutls hash provider, Daniel P . Berrangé, 2021/07/12
- [PULL 16/22] crypto: add gnutls hmac provider, Daniel P . Berrangé, 2021/07/12
- [PULL 17/22] crypto: add gnutls pbkdf provider, Daniel P . Berrangé, 2021/07/12
- [PULL 18/22] crypto: prefer gnutls as the crypto backend if new enough, Daniel P . Berrangé, 2021/07/12
- [PULL 19/22] net/rocker: use GDateTime for formatting timestamp in debug messages, Daniel P . Berrangé, 2021/07/12
- [PULL 20/22] io: use GDateTime for formatting timestamp for websock headers, Daniel P . Berrangé, 2021/07/12
- [PULL 21/22] seccomp: don't block getters for resource control syscalls, Daniel P . Berrangé, 2021/07/12
- [PULL 22/22] tests/migration: fix unix socket migration,
Daniel P . Berrangé <=
- Re: [PULL 00/22] Crypto and more patches, Peter Maydell, 2021/07/13