Rather than change https://github.com/openstack/nova/blob/7babcdfd1d440c484d49d45ffe4f81264cdc4f73/nova/compute/manager.py#L2075 to catch BaseException I would probably just have it also catch eventlet.Timeout and/or initialize the result variable before the try/except/finally block.
Rather than change https:/ /github. com/openstack/ nova/blob/ 7babcdfd1d440c4 84d49d45ffe4f81 264cdc4f73/ nova/compute/ manager. py#L2075 to catch BaseException I would probably just have it also catch eventlet.Timeout and/or initialize the result variable before the try/except/finally block.