openstack
/
nova
Code Issues Proposed changes

Merge "Log CellTimeout traceback in scatter_gather_cells"

This commit is contained in:
Zuul 2019-10-05 17:41:20 +00:00 committed by Gerrit Code Review
parent 85b83f972d 0436a95f37
commit 2c6542948f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/context.py
View File

@ -445,15 +445,14 @@ def scatter_gather_cells(context, cell_mappings, timeout, fn, *args, **kwargs):
except exception.CellTimeout:
# NOTE(melwitt): We'll fill in did_not_respond_sentinels at the
# same time we kill/wait for the green threads.
pass
LOG.warning('Timed out waiting for response from cell %s',
cell_uuid, exc_info=True)
# Kill the green threads still pending and wait on those we know are done.
for cell_uuid, greenthread in greenthreads:
if cell_uuid not in results:
greenthread.kill()
results[cell_uuid] = did_not_respond_sentinel
LOG.warning('Timed out waiting for response from cell %s',
cell_uuid)
else:
greenthread.wait()