Skip to content

Commit

Permalink
Support zero-size image creation via the v1 API
Browse files Browse the repository at this point in the history
Addresses LP 1025353 for the v1 API.

Transition image status to active immediately on creation
(as opposed to leaving it queued forever) if the size is set
to zero from the get-go.

This change allows an image to be created that simply acts as
a properties bucket, but requires no image data. For example,
an image created from a booted-from-volume instance where only
the kernel, ramdisk ID, and block device mappings are required.

Change-Id: I61e96f3fe5f5245fec791170b4a8b4c72135c3de
  • Loading branch information
Eoghan Glynn committed Jul 24, 2012
1 parent e20e2c8 commit 55cf240
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
7 changes: 5 additions & 2 deletions doc/source/statuses.rst
Expand Up @@ -22,7 +22,8 @@ Images in Glance can be in one the following statuses:
* ``queued``

The image identifier has been reserved for an image in the Glance
registry. No image data has been uploaded to Glance.
registry. No image data has been uploaded to Glance and the image
size was not explicitly set to zero on creation.

* ``saving``

Expand All @@ -34,7 +35,9 @@ Images in Glance can be in one the following statuses:

* ``active``

Denotes an image that is fully available in Glance.
Denotes an image that is fully available in Glance. This occurs when
the image data is uploaded, or the image size is explicitly set to
zero on creation.

* ``killed``

Expand Down
13 changes: 9 additions & 4 deletions glance/api/v1/images.py
Expand Up @@ -272,8 +272,11 @@ def show(self, req, id):
self._enforce(req, 'get_image')
image_meta = self.get_active_image_meta_or_404(req, id)

image_iterator, size = self._get_from_store(image_meta['location'])
image_meta['size'] = size or image_meta['size']
if image_meta.get('size') == 0:
image_iterator = iter([])
else:
image_iterator, size = self._get_from_store(image_meta['location'])
image_meta['size'] = size or image_meta['size']

del image_meta['location']
return {
Expand All @@ -295,6 +298,10 @@ def _reserve(self, req, image_meta):
:raises HTTPBadRequest if image metadata is not valid
"""
location = self._external_source(image_meta, req)

image_meta['status'] = ('active' if image_meta.get('size') == 0
else 'queued')

if location:
store = get_store_from_location(location)
# check the store exists before we hit the registry, but we
Expand All @@ -309,8 +316,6 @@ def _reserve(self, req, image_meta):
# to a non-zero value during upload
image_meta['size'] = image_meta.get('size', 0)

image_meta['status'] = 'queued'

try:
image_meta = registry.add_image_metadata(req.context, image_meta)
return image_meta
Expand Down

0 comments on commit 55cf240

Please sign in to comment.