Merge "stop image downloads to memory"

This commit is contained in:
Zuul 2020-12-02 04:45:15 +00:00 committed by Gerrit Code Review
commit ea358057f8
4 changed files with 19 additions and 3 deletions

View File

@ -478,7 +478,11 @@ class SaveImage(command.Command):
image_client = self.app.client_manager.image
image = image_client.find_image(parsed_args.image)
image_client.download_image(image.id, output=parsed_args.file)
output_file = parsed_args.file
if output_file is None:
output_file = getattr(sys.stdout, "buffer", sys.stdout)
image_client.download_image(image.id, stream=True, output=output_file)
class SetImage(command.Command):

View File

@ -803,7 +803,11 @@ class SaveImage(command.Command):
image_client = self.app.client_manager.image
image = image_client.find_image(parsed_args.image)
image_client.download_image(image.id, output=parsed_args.file)
output_file = parsed_args.file
if output_file is None:
output_file = getattr(sys.stdout, "buffer", sys.stdout)
image_client.download_image(image.id, stream=True, output=output_file)
class SetImage(command.Command):

View File

@ -1618,7 +1618,7 @@ class TestImageSave(TestImage):
verifylist = [
('file', '/path/to/file'),
('image', self.image.id)
('image', self.image.id),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -1626,6 +1626,7 @@ class TestImageSave(TestImage):
self.client.download_image.assert_called_once_with(
self.image.id,
stream=True,
output='/path/to/file')

View File

@ -0,0 +1,7 @@
---
fixes:
- Stream image download to avoid buffering data in memory which rapidly
exhausts memory resulting in OOM kill or system crash for all but the
smallest of images. Fixes https://storyboard.openstack.org/#!/story/2007672
- Restore default behavior of 'openstack image save' to send data to stdout
Relates to https://storyboard.openstack.org/#!/story/2007672.