Comment 4 for bug 1389985

There is a patch under review to fix this in glance: https://review.openstack.org/#/c/122114/

This could be the wrong approach to fixing the problem, but it just extends the current method of handling deadlocks to also deal with connection errors.