Merge "Log CellTimeout traceback in scatter_gather_cells"
This commit is contained in:
commit
2c6542948f
|
@ -445,15 +445,14 @@ def scatter_gather_cells(context, cell_mappings, timeout, fn, *args, **kwargs):
|
||||||
except exception.CellTimeout:
|
except exception.CellTimeout:
|
||||||
# NOTE(melwitt): We'll fill in did_not_respond_sentinels at the
|
# NOTE(melwitt): We'll fill in did_not_respond_sentinels at the
|
||||||
# same time we kill/wait for the green threads.
|
# 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.
|
# Kill the green threads still pending and wait on those we know are done.
|
||||||
for cell_uuid, greenthread in greenthreads:
|
for cell_uuid, greenthread in greenthreads:
|
||||||
if cell_uuid not in results:
|
if cell_uuid not in results:
|
||||||
greenthread.kill()
|
greenthread.kill()
|
||||||
results[cell_uuid] = did_not_respond_sentinel
|
results[cell_uuid] = did_not_respond_sentinel
|
||||||
LOG.warning('Timed out waiting for response from cell %s',
|
|
||||||
cell_uuid)
|
|
||||||
else:
|
else:
|
||||||
greenthread.wait()
|
greenthread.wait()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue