openstack/zun
Code Issues Proposed changes

Merge "Fix an issue on deleteing container"

Browse Source
This commit is contained in:
Zuul 2018-07-17 03:22:49 +00:00 committed by Gerrit Code Review
commit 6d13f2e934
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zun/container/docker/driver.py
View File

@ -47,6 +47,17 @@ def is_not_found(e):
return '404' in str(e)
def is_not_connected(e):
# Test the following exception:
#
# 500 Server Error: Internal Server Error ("container XXX is not
# connected to the network XXX")
#
# Note(hongbin): Docker should response a 4xx instead of 500. This looks
# like a bug from docker side: https://github.com/moby/moby/issues/35888
return ' is not connected to the network ' in str(e)
def is_conflict(e):
conflict_infos = ['not running', 'not paused', 'paused']
for info in conflict_infos:
@ -376,6 +387,8 @@ class DockerDriver(driver.ContainerDriver):
except errors.APIError as api_error:
if is_not_found(api_error):
return
if is_not_connected(api_error):
return
raise
@wrap_docker_error

2
zun/tests/unit/container/docker/test_docker_driver.py
View File

@ -254,7 +254,7 @@ class TestDockerDriver(base.DriverTestCase):
True)
self.mock_docker.remove_container.assert_called_once_with(
mock_container.container_id, force=True)
self.assertEqual(1, mock_init.call_count)
self.assertEqual(2, mock_init.call_count)
def test_list(self):
self.mock_docker.list_containers.return_value = []