openstack/zun
Code Issues Proposed changes

Pass file descriptor to docker.load instead

Browse Source 
Loading image is very slow because we read the entire file into
memory in order to pass the data to docker. This commit fixed it.
It directly passed the file descriptor to docker instead of reading
the while file. This dramatically improves the performance.

Change-Id: I5b05fe6d6214de6355c074abb755a98eb182364b
This commit is contained in:
Hongbin Lu 2017-03-09 17:39:07 -06:00
parent 3f2b6d4ccc
commit b28611884f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ class DockerDriver(driver.ContainerDriver):
if image_path:
with open(image_path, 'rb') as fd:
LOG.debug('Loading local image %s into docker', image_path)
docker.load_image(fd.read())
docker.load_image(fd)
def inspect_image(self, image):
with docker_utils.docker_client() as docker:

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

@ -61,11 +61,12 @@ class TestDockerDriver(base.DriverTestCase):
def test_load_image(self):
self.mock_docker.load_image = mock.Mock()
mock_open_file = mock.mock_open(read_data='test_data')
mock_open_file = mock.mock_open()
with mock.patch('zun.container.docker.driver.open', mock_open_file):
mock_image = mock.MagicMock()
self.driver.load_image(mock_image, 'test')
self.mock_docker.load_image.assert_called_once_with('test_data')
self.mock_docker.load_image.assert_called_once_with(
mock_open_file.return_value)
def test_images(self):
self.mock_docker.images = mock.Mock()