aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Moravec <pmoravec@redhat.com>2021-11-03 16:07:15 +0100
committerJake Hunsaker <jhunsake@redhat.com>2021-11-03 12:27:42 -0400
commita93e118a9c88df52fd2c701d2276185f877d565c (patch)
tree19e9ad1bbe32c41af7b84ef6fc416a75d24ff582
parentc60c28f67c19e8adbf347206b27eee4e7fe8f16e (diff)
downloadsos-a93e118a9c88df52fd2c701d2276185f877d565c.tar.gz
[report] shutdown threads for timeouted plugins
Wait for shutting down threads of timeouted plugins, to prevent them in writing to moved auxiliary files like sos_logs/sos.log Resolves: #2722 Closes: #2746 Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
-rw-r--r--sos/report/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/sos/report/__init__.py b/sos/report/__init__.py
index 1b5bc97d..ef86b28d 100644
--- a/sos/report/__init__.py
+++ b/sos/report/__init__.py
@@ -1046,6 +1046,7 @@ class SoSReport(SoSComponent):
self.ui_log.error("\n Plugin %s timed out\n" % plugin[1])
self.running_plugs.remove(plugin[1])
self.loaded_plugins[plugin[0]-1][1].set_timeout_hit()
+ pool.shutdown(wait=True)
pool._threads.clear()
if self.opts.estimate_only:
from pathlib import Path