aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ziptest
diff options
context:
space:
mode:
authorJake Hunsaker <jhunsake@redhat.com>2018-11-29 17:45:59 -0500
committerBryn M. Reeves <bmr@redhat.com>2019-03-19 17:36:33 +0000
commit2463612fc00c574b4b49c514fd4dac8d0b319d4a (patch)
treefcc49bc73a7dafe8e031145f39dc9fe20633dbd0 /tests/ziptest
parent430806a2bc1d11b60b867e0296e7200e17595cfc (diff)
downloadsos-2463612fc00c574b4b49c514fd4dac8d0b319d4a.tar.gz
[sosreport] Clear nested threadpool threads on timeout
We nest ThreadPoolExecutors to run plugins to enable whole-plugin timeouts, with the timeout being handled by the nested threadpool. However, calling shutdown() on the nested thread is incorrect in the event of a plugin timeout, as it only cancels pending jobs, not currently running jobs that the timed-out plugin is. Instead, call _threads.clear() to forcibly cancel the running job, thus allowing the thread the return to the higher level threadpool and allow other plugins to run via that thread. This still allows data captured up to the point of the timeout to be written to the sosreport. Fixes: #1446 Resolves: #1492 Signed-off-by: Jake Hunsaker <jhunsake@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
Diffstat (limited to 'tests/ziptest')
0 files changed, 0 insertions, 0 deletions