Since we can't generally shrink incoming images, add extra checks
to ensure oversized images are not allowed through.
All cases when populating the libvirt image cache are now handled,
including the initial download from glance, where we avoid
converting to raw, as that could generate non sparse images
much larger than the downloaded image.
* nova/virt/libvirt/utils.py (fetch_image): Allow passing through
of the max_size parameter.
* nova/virt/images.py (fetch_to_raw): Accept the max_size parameter,
and use it to discard images with larger (virtual) sizes.
* nova/virt/libvirt/imagebackend.py (verify_base_size): A new
refactored function to identify and raise exception to oversized images.
(Raw.create_image): Pass the max_size to the fetch function.
Also enforce virtual image size checking for already fetched images,
as this class (despite the name) can be handling qcow files.
(Qcow2.create_image): Pass the max_size to the fetch function,
or verify the virtual size for the instance as done previously.
(Lvm.create_image): Pass the max_size to the fetch function.
Also check the size before transferring to the volume to improve
efficiency by not even attempting the transfer of oversized images.
(Rbd.create_image): Likewise.
* nova/tests/fake_libvirt_utils.py: Support max_size arg.
* nova/tests/test_libvirt.py (test_fetch_raw_image):
Add a case to check oversized images are discarded.
* nova/tests/test_imagebackend.py (test_create_image_too_small):
Adjust to avoid the fetch size check.
Reviewed: https:/ /review. openstack. org/54768 github. com/openstack/ nova/commit/ 135faa7b5d98553 12bedc19e5e1ece bae34d3d18
Committed: http://
Submitter: Jenkins
Branch: stable/grizzly
commit 135faa7b5d98553 12bedc19e5e1ece bae34d3d18
Author: Pádraig Brady <email address hidden>
Date: Fri Sep 27 04:07:14 2013 +0100
ensure we don't boot oversized images
Since we can't generally shrink incoming images, add extra checks
to ensure oversized images are not allowed through.
All cases when populating the libvirt image cache are now handled,
including the initial download from glance, where we avoid
converting to raw, as that could generate non sparse images
much larger than the downloaded image.
* nova/virt/ libvirt/ utils.py (fetch_image): Allow passing through libvirt/ imagebackend. py (verify_base_size): A new create_ image): Pass the max_size to the fetch function. create_ image): Pass the max_size to the fetch function, create_ image): Pass the max_size to the fetch function. create_ image): Likewise. fake_libvirt_ utils.py: Support max_size arg. test_libvirt. py (test_fetch_ raw_image) : test_imagebacke nd.py (test_create_ image_too_ small):
of the max_size parameter.
* nova/virt/images.py (fetch_to_raw): Accept the max_size parameter,
and use it to discard images with larger (virtual) sizes.
* nova/virt/
refactored function to identify and raise exception to oversized images.
(Raw.
Also enforce virtual image size checking for already fetched images,
as this class (despite the name) can be handling qcow files.
(Qcow2.
or verify the virtual size for the instance as done previously.
(Lvm.
Also check the size before transferring to the volume to improve
efficiency by not even attempting the transfer of oversized images.
(Rbd.
* nova/tests/
* nova/tests/
Add a case to check oversized images are discarded.
* nova/tests/
Adjust to avoid the fetch size check.
Fixes bug: 1177830
Fixes bug: 1206081
Conflicts:
nova/ tests/test_ imagebackend. py virt/libvirt/ imagebackend. py
nova/
Change-Id: Idc35fce580be4f 74e23883d1b4bea 6475c3f6e30