openstack
/
zun
Code Issues Proposed changes

Merge "Skip populating container's state on tasks"

This commit is contained in:
Zuul 2019-04-16 02:35:27 +00:00 committed by Gerrit Code Review
parent df4db166da 9205710912
commit 7992b9e6ff
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -633,6 +633,11 @@ class DockerDriver(driver.ContainerDriver):
container.runtime = hostconfig.get('Runtime')
def _populate_container_state(self, container, state):
if container.task_state:
# NOTE(hongbin): we don't want to populate container state
# if another thread is doing task on this container.
return
if not state:
LOG.warning('Receive unexpected state from docker: %s', state)
container.status = consts.UNKNOWN

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

@ -553,7 +553,7 @@ class TestDockerDriver(base.DriverTestCase):
self.mock_docker.inspect_container = mock.Mock(
return_value={'State': 'created',
'Config': {'Cmd': ['fake_command']}})
mock_container = mock.MagicMock()
mock_container = mock.MagicMock(task_state=None)
mock_container.status = consts.CREATING
self.driver.show(self.context, mock_container)
self.mock_docker.inspect_container.assert_called_once_with(
@ -598,8 +598,8 @@ class TestDockerDriver(base.DriverTestCase):
'FinishedAt': '0001-01-01T00:00:00Z',
}}
)
mock_container = mock.MagicMock()
mock_container.status = 'existed'
mock_container = mock.MagicMock(task_state=None)
mock_container.status = 'Created'
mock_container.Error = 'Container start error.'
self.driver.show(self.context, mock_container)
self.mock_docker.inspect_container.assert_called_once_with(
@ -615,8 +615,8 @@ class TestDockerDriver(base.DriverTestCase):
'FinishedAt': '0001-01-01T00:00:00Z',
}}
)
mock_container = mock.MagicMock()
mock_container.status = 'UNKNOWN'
mock_container = mock.MagicMock(task_state=None)
mock_container.status = 'Running'
mock_container.Error = 'Container run error.'
self.driver.show(self.context, mock_container)
self.mock_docker.inspect_container.assert_called_once_with(