openstack/deb-glance
Code Issues Proposed changes

Remove some unused glance-cache-queue-image code

Browse Source 
Commit d453def removed the glance-cache-queue-image script but
neglected to remove the PasteDeploy app and config.

Change-Id: I20daf529fd9e466cdad9d3db19bc79ed16f24375
This commit is contained in:
Mark McLoughlin 2012-06-16 17:00:20 +01:00
parent 7f4bea708a
commit 3b4c276550
4 changed files with 0 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/glance-cache-paste.ini
View File

@ -6,6 +6,3 @@ paste.app_factory = glance.image_cache.prefetcher:Prefetcher.factory
[app:glance-cleaner]
paste.app_factory = glance.image_cache.cleaner:Cleaner.factory
[app:glance-queue-image]
paste.app_factory = glance.image_cache.queue_image:Queuer.factory

77
glance/image_cache/queue_image.py
View File

@ -1,77 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2011 OpenStack LLC.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""
Queues images for prefetching into the image cache
"""
import logging
import eventlet
from glance.common import context
from glance.common import exception
from glance.image_cache import base
from glance import registry
logger = logging.getLogger(__name__)
class Queuer(base.CacheApp):
def __init__(self):
super(Queuer, self).__init__()
registry.configure_registry_client()
registry.configure_registry_admin_creds()
def queue_image(self, image_id):
ctx = context.RequestContext(is_admin=True, show_deleted=True)
try:
image_meta = registry.get_image_metadata(ctx, image_id)
if image_meta['status'] != 'active':
logger.warn(_("Image '%s' is not active. Not queueing."),
image_id)
return False
except exception.NotFound:
logger.warn(_("No metadata found for image '%s'"), image_id)
return False
logger.debug(_("Queueing image '%s'"), image_id)
self.cache.queue_image(image_id)
return True
def run(self, images):
num_images = len(images)
if num_images == 0:
logger.debug(_("No images to queue!"))
return True
logger.debug(_("Received %d images to queue"), num_images)
pool = eventlet.GreenPool(num_images)
results = pool.imap(self.queue_image, images)
successes = sum([1 for r in results if r is True])
if successes != num_images:
logger.error(_("Failed to successfully queue all "
"images in queue."))
return False
logger.info(_("Successfully queued all %d images"), num_images)
return True

3
glance/tests/functional/v1/test_bin_glance_cache_manage.py
View File

@ -216,9 +216,6 @@ paste.app_factory = glance.image_cache.prefetcher:Prefetcher.factory
[app:glance-cleaner]
paste.app_factory = glance.image_cache.cleaner:Cleaner.factory
[app:glance-queue-image]
paste.app_factory = glance.image_cache.queue_image:Queuer.factory
""")
cmd = ("bin/glance-cache-prefetcher --config-file %s" %

3
glance/tests/functional/v1/test_cache_middleware.py
View File

@ -467,9 +467,6 @@ paste.app_factory = glance.image_cache.prefetcher:Prefetcher.factory
[app:glance-cleaner]
paste.app_factory = glance.image_cache.cleaner:Cleaner.factory
[app:glance-queue-image]
paste.app_factory = glance.image_cache.queue_image:Queuer.factory
""")
self.verify_no_images()