diff options
| author |   Trevor Gamblin <trevor.gamblin@windriver.com> | 2020-02-07 08:46:52 -0500 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2020-02-20 18:58:01 -0800 |
| commit | 0e94cfb4aa718b4842f608879b77d5671b5bf338 (patch) | |
| tree | e2106f6d46d7d1a7f64477d2978ac45af6d3e559 | |
| parent | 2b3235f10bb1759d651d28b41825ad53192c841a (diff) | |
| download | openembedded-core-contrib-0e94cfb4aa718b4842f608879b77d5671b5bf338.tar.gz | |
qemurunner.py: add try/except for pid handling race
In some instances, attempts to remove the qemu pidfile within the
stop() method fail despite the os.path.exists() call immediately
before implying that the file is present. Add a try/except block
to log a warning if this occurs, rather than failing outright,
since the process simply appears to be exiting at an inconvenient
time.
[YOCTO #13675]
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit eadb899e23b18eb9eaff145c3bf5b20fb417c3e8)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index fe8b77d97a..0d63e44ea7 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -396,7 +396,10 @@ class QemuRunner: self.qemupid = None self.ip = None if os.path.exists(self.qemu_pidfile): - os.remove(self.qemu_pidfile) + try: + os.remove(self.qemu_pidfile) + except FileNotFoundError as e: + self.logger.warning('qemu pidfile is no longer present') if self.monitorpipe: self.monitorpipe.close() |