openstack/glance
Code Issues Proposed changes

debug level logs should not be translated

Browse Source 
According to the OpenStack translation policy available at
https://wiki.openstack.org/wiki/LoggingStandards debug messages
should not be translated. Like mentioned in several changes in
Nova by garyk this is to help prioritize log translation.

This patch adds a new hacking check - N319 - that ensures all
debug log messages don't have translations.

Change-Id: I9dd958b904671a7eb95883026e14684469dc52d5
Closes-Bug: #1317847
This commit is contained in:
Christian Berendt 2014-05-09 12:33:21 +02:00
parent edc4856e06
commit 86dd9ff66c
39 changed files with 292 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HACKING.rst
View File

@ -8,4 +8,4 @@ glance Style Commandments
glance Specific Commandments glance Specific Commandments
-------------------------- --------------------------
None so far - [G319] Validate that debug level logs are not translated

4
glance/api/middleware/cache.py
View File

@ -122,7 +122,7 @@ class CacheFilter(wsgi.Middleware):
except webob.exc.HTTPForbidden: except webob.exc.HTTPForbidden:
return None return None
LOG.debug(_("Cache hit for image '%s'"), image_id) LOG.debug("Cache hit for image '%s'", image_id)
image_iterator = self.get_from_cache(image_id) image_iterator = self.get_from_cache(image_id)
method = getattr(self, '_process_%s_request' % version) method = getattr(self, '_process_%s_request' % version)
@ -235,7 +235,7 @@ class CacheFilter(wsgi.Middleware):
def _process_DELETE_response(self, resp, image_id): def _process_DELETE_response(self, resp, image_id):
if self.cache.is_cached(image_id): if self.cache.is_cached(image_id):
LOG.debug(_("Removing image %s from cache"), image_id) LOG.debug("Removing image %s from cache", image_id)
self.cache.delete_cached_image(image_id) self.cache.delete_cached_image(image_id)
return resp return resp

10
glance/api/middleware/version_negotiation.py
View File

@ -50,24 +50,24 @@ class VersionNegotiationFilter(wsgi.Middleware):
accept = str(req.accept) accept = str(req.accept)
if accept.startswith('application/vnd.openstack.images-'): if accept.startswith('application/vnd.openstack.images-'):
LOG.debug(_("Using media-type versioning")) LOG.debug("Using media-type versioning")
token_loc = len('application/vnd.openstack.images-') token_loc = len('application/vnd.openstack.images-')
req_version = accept[token_loc:] req_version = accept[token_loc:]
else: else:
LOG.debug(_("Using url versioning")) LOG.debug("Using url versioning")
# Remove version in url so it doesn't conflict later # Remove version in url so it doesn't conflict later
req_version = self._pop_path_info(req) req_version = self._pop_path_info(req)
try: try:
version = self._match_version_string(req_version) version = self._match_version_string(req_version)
except ValueError: except ValueError:
LOG.debug(_("Unknown version. Returning version choices.")) LOG.debug("Unknown version. Returning version choices.")
return self.versions_app return self.versions_app
req.environ['api.version'] = version req.environ['api.version'] = version
req.path_info = ''.join(('/v', str(version), req.path_info)) req.path_info = ''.join(('/v', str(version), req.path_info))
LOG.debug(_("Matched version: v%d"), version) LOG.debug("Matched version: v%d", version)
LOG.debug(_('new path %s'), req.path_info) LOG.debug('new path %s', req.path_info)
return None return None
def _match_version_string(self, subject): def _match_version_string(self, subject):

4
glance/api/policy.py
View File

@ -80,7 +80,7 @@ class Enforcer(object):
rule_type = "default " rule_type = "default "
text_rules = dict((k, str(v)) for k, v in rules.items()) text_rules = dict((k, str(v)) for k, v in rules.items())
msg = (_('Loaded %(rule_type)spolicy rules: %(text_rules)s') % msg = ('Loaded %(rule_type)spolicy rules: %(text_rules)s' %
{'rule_type': rule_type, 'text_rules': text_rules}) {'rule_type': rule_type, 'text_rules': text_rules})
LOG.debug(msg) LOG.debug(msg)
@ -103,7 +103,7 @@ class Enforcer(object):
""" """
mtime = os.path.getmtime(self.policy_path) mtime = os.path.getmtime(self.policy_path)
if not self.policy_file_contents or mtime != self.policy_file_mtime: if not self.policy_file_contents or mtime != self.policy_file_mtime:
LOG.debug(_("Loading policy from %s") % self.policy_path) LOG.debug("Loading policy from %s" % self.policy_path)
with open(self.policy_path) as fap: with open(self.policy_path) as fap:
raw_contents = fap.read() raw_contents = fap.read()
rules_dict = jsonutils.loads(raw_contents) rules_dict = jsonutils.loads(raw_contents)

6
glance/api/v1/controller.py
View File

@ -38,12 +38,12 @@ class BaseController(object):
try: try:
return registry.get_image_metadata(context, image_id) return registry.get_image_metadata(context, image_id)
except exception.NotFound: except exception.NotFound:
msg = _("Image with identifier %s not found") % image_id msg = "Image with identifier %s not found" % image_id
LOG.debug(msg) LOG.debug(msg)
raise webob.exc.HTTPNotFound( raise webob.exc.HTTPNotFound(
msg, request=request, content_type='text/plain') msg, request=request, content_type='text/plain')
except exception.Forbidden: except exception.Forbidden:
msg = _("Forbidden image access") msg = "Forbidden image access"
LOG.debug(msg) LOG.debug(msg)
raise webob.exc.HTTPForbidden(msg, raise webob.exc.HTTPForbidden(msg,
request=request, request=request,
@ -56,7 +56,7 @@ class BaseController(object):
""" """
image = self.get_image_meta_or_404(request, image_id) image = self.get_image_meta_or_404(request, image_id)
if image['status'] != 'active': if image['status'] != 'active':
msg = _("Image %s is not active") % image_id msg = "Image %s is not active" % image_id
LOG.debug(msg) LOG.debug(msg)
raise webob.exc.HTTPNotFound( raise webob.exc.HTTPNotFound(
msg, request=request, content_type='text/plain') msg, request=request, content_type='text/plain')

58
glance/api/v1/images.py
View File

@ -193,7 +193,7 @@ class Controller(controller.BaseController):
for key in create_props: for key in create_props:
if (self.prop_enforcer.check_property_rules( if (self.prop_enforcer.check_property_rules(
key, 'create', req.context) is False): key, 'create', req.context) is False):
msg = _("Property '%s' is protected") % key msg = "Property '%s' is protected" % key
LOG.debug(msg) LOG.debug(msg)
raise HTTPForbidden(explanation=msg, raise HTTPForbidden(explanation=msg,
request=req, request=req,
@ -237,7 +237,7 @@ class Controller(controller.BaseController):
key, 'update', req.context) is False and key, 'update', req.context) is False and
image_meta['properties'][key] != image_meta['properties'][key] !=
orig_meta['properties'][key]) or not has_read): orig_meta['properties'][key]) or not has_read):
msg = _("Property '%s' is protected") % key msg = "Property '%s' is protected" % key
LOG.debug(msg) LOG.debug(msg)
raise HTTPForbidden(explanation=msg, raise HTTPForbidden(explanation=msg,
request=req, request=req,
@ -271,7 +271,7 @@ class Controller(controller.BaseController):
orig_meta['properties'][key] orig_meta['properties'][key]
elif (self.prop_enforcer.check_property_rules( elif (self.prop_enforcer.check_property_rules(
key, 'delete', req.context) is False): key, 'delete', req.context) is False):
msg = _("Property '%s' is protected") % key msg = "Property '%s' is protected" % key
LOG.debug(msg) LOG.debug(msg)
raise HTTPForbidden(explanation=msg, raise HTTPForbidden(explanation=msg,
request=req, request=req,
@ -425,7 +425,7 @@ class Controller(controller.BaseController):
for scheme in schemes: for scheme in schemes:
if pieces.scheme == scheme: if pieces.scheme == scheme:
return source return source
msg = _("External sourcing not supported for store %s") % source msg = "External sourcing not supported for store %s" % source
LOG.debug(msg) LOG.debug(msg)
raise HTTPBadRequest(explanation=msg, raise HTTPBadRequest(explanation=msg,
request=req, request=req,
@ -498,7 +498,7 @@ class Controller(controller.BaseController):
location = self._external_source(image_meta, req) location = self._external_source(image_meta, req)
store = image_meta.get('store') store = image_meta.get('store')
if store and store not in get_known_stores(): if store and store not in get_known_stores():
msg = _("Required store %s is invalid") % store msg = "Required store %s is invalid" % store
LOG.debug(msg) LOG.debug(msg)
raise HTTPBadRequest(explanation=msg, raise HTTPBadRequest(explanation=msg,
content_type='text/plain') content_type='text/plain')
@ -510,7 +510,7 @@ class Controller(controller.BaseController):
try: try:
store = get_store_from_location(location) store = get_store_from_location(location)
except exception.BadStoreUri: except exception.BadStoreUri:
msg = _("Invalid location %s") % location msg = "Invalid location %s" % location
LOG.debug(msg) LOG.debug(msg)
raise HTTPBadRequest(explanation=msg, raise HTTPBadRequest(explanation=msg,
request=req, request=req,
@ -533,7 +533,7 @@ class Controller(controller.BaseController):
self.notifier.info("image.create", redact_loc(image_meta)) self.notifier.info("image.create", redact_loc(image_meta))
return image_meta return image_meta
except exception.Duplicate: except exception.Duplicate:
msg = (_("An image with identifier %s already exists") % msg = ("An image with identifier %s already exists" %
image_meta['id']) image_meta['id'])
LOG.debug(msg) LOG.debug(msg)
raise HTTPConflict(explanation=msg, raise HTTPConflict(explanation=msg,
@ -547,7 +547,7 @@ class Controller(controller.BaseController):
request=req, request=req,
content_type="text/plain") content_type="text/plain")
except exception.Forbidden: except exception.Forbidden:
msg = _("Forbidden to reserve image.") msg = "Forbidden to reserve image."
LOG.debug(msg) LOG.debug(msg)
raise HTTPForbidden(explanation=msg, raise HTTPForbidden(explanation=msg,
request=req, request=req,
@ -574,7 +574,7 @@ class Controller(controller.BaseController):
copy_from) copy_from)
except Exception as e: except Exception as e:
upload_utils.safe_kill(req, image_meta['id']) upload_utils.safe_kill(req, image_meta['id'])
msg = _("Copy from external source failed: %s") % e msg = "Copy from external source failed: %s" % e
LOG.debug(msg) LOG.debug(msg)
return return
image_meta['size'] = image_size or image_meta['size'] image_meta['size'] = image_size or image_meta['size']
@ -583,7 +583,7 @@ class Controller(controller.BaseController):
req.get_content_type(('application/octet-stream',)) req.get_content_type(('application/octet-stream',))
except exception.InvalidContentType: except exception.InvalidContentType:
upload_utils.safe_kill(req, image_meta['id']) upload_utils.safe_kill(req, image_meta['id'])
msg = _("Content-Type must be application/octet-stream") msg = "Content-Type must be application/octet-stream"
LOG.debug(msg) LOG.debug(msg)
raise HTTPBadRequest(explanation=msg) raise HTTPBadRequest(explanation=msg)
@ -594,13 +594,13 @@ class Controller(controller.BaseController):
store = self.get_store_or_400(req, scheme) store = self.get_store_or_400(req, scheme)
image_id = image_meta['id'] image_id = image_meta['id']
LOG.debug(_("Setting image %s to status 'saving'"), image_id) LOG.debug("Setting image %s to status 'saving'", image_id)
registry.update_image_metadata(req.context, image_id, registry.update_image_metadata(req.context, image_id,
{'status': 'saving'}) {'status': 'saving'})
LOG.debug(_("Uploading image data for image %(image_id)s " LOG.debug("Uploading image data for image %(image_id)s "
"to %(scheme)s store"), {'image_id': image_id, "to %(scheme)s store", {'image_id': image_id,
'scheme': scheme}) 'scheme': scheme})
self.notifier.info("image.prepare", redact_loc(image_meta)) self.notifier.info("image.prepare", redact_loc(image_meta))
@ -642,13 +642,13 @@ class Controller(controller.BaseController):
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
# Delete image data since it has been supersceded by another # Delete image data since it has been supersceded by another
# upload and re-raise. # upload and re-raise.
LOG.debug(_("duplicate operation - deleting image data for " LOG.debug("duplicate operation - deleting image data for "
" %(id)s (location:%(location)s)") % " %(id)s (location:%(location)s)" %
{'id': image_id, 'location': image_meta['location']}) {'id': image_id, 'location': image_meta['location']})
upload_utils.initiate_deletion(req, image_meta['location'], upload_utils.initiate_deletion(req, image_meta['location'],
image_id, CONF.delayed_delete) image_id, CONF.delayed_delete)
except exception.Invalid as e: except exception.Invalid as e:
msg = _("Failed to activate image. Got error: %(e)s") % {'e': e} msg = "Failed to activate image. Got error: %(e)s" % {'e': e}
LOG.debug(msg) LOG.debug(msg)
raise HTTPBadRequest(explanation=msg, raise HTTPBadRequest(explanation=msg,
request=req, request=req,
@ -691,7 +691,7 @@ class Controller(controller.BaseController):
location = image_meta.get('location') location = image_meta.get('location')
sources = filter(lambda x: x, (copy_from, location, image_data)) sources = filter(lambda x: x, (copy_from, location, image_data))
if len(sources) >= 2: if len(sources) >= 2:
msg = _("It's invalid to provide multiple image sources.") msg = "It's invalid to provide multiple image sources."
LOG.debug(msg) LOG.debug(msg)
raise HTTPBadRequest(explanation=msg, raise HTTPBadRequest(explanation=msg,
request=req, request=req,
@ -717,11 +717,11 @@ class Controller(controller.BaseController):
# size provided by the client will be used as-is. # size provided by the client will be used as-is.
if (image_size_store and if (image_size_store and
image_size_store != image_size_meta): image_size_store != image_size_meta):
msg = _("Provided image size must match the stored " msg = ("Provided image size must match the stored "
"image size. (provided size: %(ps)d, " "image size. (provided size: %(ps)d, "
"stored size: %(ss)d)") % { "stored size: %(ss)d)" % {
"ps": image_size_meta, "ps": image_size_meta,
"ss": image_size_store} "ss": image_size_store})
LOG.debug(msg) LOG.debug(msg)
raise HTTPConflict(explanation=msg, raise HTTPConflict(explanation=msg,
request=req, request=req,
@ -885,7 +885,7 @@ class Controller(controller.BaseController):
self.update_store_acls(req, id, orig_or_updated_loc, self.update_store_acls(req, id, orig_or_updated_loc,
public=is_public) public=is_public)
except exception.BadStoreUri: except exception.BadStoreUri:
msg = _("Invalid location %s") % location msg = "Invalid location %s" % location
LOG.debug(msg) LOG.debug(msg)
raise HTTPBadRequest(explanation=msg, raise HTTPBadRequest(explanation=msg,
request=req, request=req,
@ -932,7 +932,7 @@ class Controller(controller.BaseController):
image_data) image_data)
except exception.Invalid as e: except exception.Invalid as e:
msg = (_("Failed to update image metadata. Got error: %(e)s") % msg = ("Failed to update image metadata. Got error: %(e)s" %
{'e': e}) {'e': e})
LOG.debug(msg) LOG.debug(msg)
raise HTTPBadRequest(explanation=msg, raise HTTPBadRequest(explanation=msg,
@ -985,19 +985,19 @@ class Controller(controller.BaseController):
image = self.get_image_meta_or_404(req, id) image = self.get_image_meta_or_404(req, id)
if image['protected']: if image['protected']:
msg = _("Image is protected") msg = "Image is protected"
LOG.debug(msg) LOG.debug(msg)
raise HTTPForbidden(explanation=msg, raise HTTPForbidden(explanation=msg,
request=req, request=req,
content_type="text/plain") content_type="text/plain")
if image['status'] == 'pending_delete': if image['status'] == 'pending_delete':
msg = (_("Forbidden to delete a %s image.") % image['status']) msg = "Forbidden to delete a %s image." % image['status']
LOG.debug(msg) LOG.debug(msg)
raise HTTPForbidden(explanation=msg, request=req, raise HTTPForbidden(explanation=msg, request=req,
content_type="text/plain") content_type="text/plain")
elif image['status'] == 'deleted': elif image['status'] == 'deleted':
msg = _("Image %s not found.") % id msg = "Image %s not found." % id
LOG.debug(msg) LOG.debug(msg)
raise HTTPNotFound(explanation=msg, request=req, raise HTTPNotFound(explanation=msg, request=req,
content_type="text/plain") content_type="text/plain")
@ -1060,7 +1060,7 @@ class Controller(controller.BaseController):
try: try:
return get_store_from_scheme(request.context, scheme) return get_store_from_scheme(request.context, scheme)
except exception.UnknownScheme: except exception.UnknownScheme:
msg = _("Store for scheme %s not found") % scheme msg = "Store for scheme %s not found" % scheme
LOG.debug(msg) LOG.debug(msg)
raise HTTPBadRequest(explanation=msg, raise HTTPBadRequest(explanation=msg,
request=request, request=request,

4
glance/api/v1/members.py
View File

@ -72,11 +72,11 @@ class Controller(controller.BaseController):
try: try:
members = registry.get_image_members(req.context, image_id) members = registry.get_image_members(req.context, image_id)
except exception.NotFound: except exception.NotFound:
msg = _("Image with identifier %s not found") % image_id msg = "Image with identifier %s not found" % image_id
LOG.debug(msg) LOG.debug(msg)
raise webob.exc.HTTPNotFound(msg) raise webob.exc.HTTPNotFound(msg)
except exception.Forbidden: except exception.Forbidden:
msg = _("Unauthorized image access") msg = "Unauthorized image access"
LOG.debug(msg) LOG.debug(msg)
raise webob.exc.HTTPForbidden(msg) raise webob.exc.HTTPForbidden(msg)
return dict(members=members) return dict(members=members)

16
glance/api/v1/upload_utils.py
View File

@ -133,11 +133,11 @@ def upload_data_to_store(req, image_meta, image_data, store, notifier):
# Update the database with the checksum returned # Update the database with the checksum returned
# from the backend store # from the backend store
LOG.debug(_("Updating image %(image_id)s data. " LOG.debug("Updating image %(image_id)s data. "
"Checksum set to %(checksum)s, size set " "Checksum set to %(checksum)s, size set "
"to %(size)d"), {'image_id': image_id, "to %(size)d", {'image_id': image_id,
'checksum': checksum, 'checksum': checksum,
'size': size}) 'size': size})
update_data = {'checksum': checksum, update_data = {'checksum': checksum,
'size': size} 'size': size}
try: try:
@ -162,7 +162,7 @@ def upload_data_to_store(req, image_meta, image_data, store, notifier):
content_type='text/plain') content_type='text/plain')
except exception.Duplicate as e: except exception.Duplicate as e:
msg = _("Attempt to upload duplicate image: %s") % e msg = "Attempt to upload duplicate image: %s" % e
LOG.debug(msg) LOG.debug(msg)
# NOTE(dosaboy): do not delete the image since it is likely that this # NOTE(dosaboy): do not delete the image since it is likely that this
# conflict is a result of another concurrent upload that will be # conflict is a result of another concurrent upload that will be
@ -173,7 +173,7 @@ def upload_data_to_store(req, image_meta, image_data, store, notifier):
content_type="text/plain") content_type="text/plain")
except exception.Forbidden as e: except exception.Forbidden as e:
msg = _("Forbidden upload attempt: %s") % e msg = "Forbidden upload attempt: %s" % e
LOG.debug(msg) LOG.debug(msg)
safe_kill(req, image_id) safe_kill(req, image_id)
notifier.error('image.upload', msg) notifier.error('image.upload', msg)
@ -231,7 +231,7 @@ def upload_data_to_store(req, image_meta, image_data, store, notifier):
safe_kill(req, image_id) safe_kill(req, image_id)
except (ValueError, IOError) as e: except (ValueError, IOError) as e:
msg = _("Client disconnected before sending all data to backend") msg = "Client disconnected before sending all data to backend"
LOG.debug(msg) LOG.debug(msg)
safe_kill(req, image_id) safe_kill(req, image_id)
raise webob.exc.HTTPBadRequest(explanation=msg, raise webob.exc.HTTPBadRequest(explanation=msg,

4
glance/api/v2/image_data.py
View File

@ -86,7 +86,7 @@ class ImageDataController(object):
content_type='text/plain') content_type='text/plain')
except ValueError as e: except ValueError as e:
LOG.debug(_("Cannot save data for image %(id)s: %(e)s"), LOG.debug("Cannot save data for image %(id)s: %(e)s",
{'id': image_id, 'e': utils.exception_to_str(e)}) {'id': image_id, 'e': utils.exception_to_str(e)})
self._restore(image_repo, image) self._restore(image_repo, image)
raise webob.exc.HTTPBadRequest(explanation= raise webob.exc.HTTPBadRequest(explanation=
@ -98,7 +98,7 @@ class ImageDataController(object):
raise webob.exc.HTTPConflict(explanation=e.msg, request=req) raise webob.exc.HTTPConflict(explanation=e.msg, request=req)
except exception.Forbidden as e: except exception.Forbidden as e:
msg = (_("Not allowed to upload image data for image %s") % msg = ("Not allowed to upload image data for image %s" %
image_id) image_id)
LOG.debug(msg) LOG.debug(msg)
raise webob.exc.HTTPForbidden(explanation=msg, request=req) raise webob.exc.HTTPForbidden(explanation=msg, request=req)

50
glance/cmd/replicator.py
View File

@ -101,8 +101,8 @@ class ImageService(object):
if self.auth_token: if self.auth_token:
headers.setdefault('x-auth-token', self.auth_token) headers.setdefault('x-auth-token', self.auth_token)
logging.debug(_('Request: %(method)s http://%(server)s:%(port)s' logging.debug('Request: %(method)s http://%(server)s:%(port)s'
'%(url)s with headers %(headers)s') '%(url)s with headers %(headers)s'
% {'method': method, % {'method': method,
'server': self.conn.host, 'server': self.conn.host,
'port': self.conn.port, 'port': self.conn.port,
@ -114,7 +114,7 @@ class ImageService(object):
headers = self._header_list_to_dict(response.getheaders()) headers = self._header_list_to_dict(response.getheaders())
code = response.status code = response.status
code_description = httplib.responses[code] code_description = httplib.responses[code]
logging.debug(_('Response: %(code)s %(status)s %(headers)s') logging.debug('Response: %(code)s %(status)s %(headers)s'
% {'code': code, % {'code': code,
'status': code_description, 'status': code_description,
'headers': repr(headers)}) 'headers': repr(headers)})
@ -236,7 +236,7 @@ class ImageService(object):
response = self._http_request('POST', url, headers, image_data) response = self._http_request('POST', url, headers, image_data)
headers = self._header_list_to_dict(response.getheaders()) headers = self._header_list_to_dict(response.getheaders())
logging.debug(_('Image post done')) logging.debug('Image post done')
body = response.read() body = response.read()
return headers, body return headers, body
@ -255,7 +255,7 @@ class ImageService(object):
response = self._http_request('PUT', url, headers, '') response = self._http_request('PUT', url, headers, '')
headers = self._header_list_to_dict(response.getheaders()) headers = self._header_list_to_dict(response.getheaders())
logging.debug(_('Image post done')) logging.debug('Image post done')
body = response.read() body = response.read()
return headers, body return headers, body
@ -289,7 +289,7 @@ def replication_size(options, args):
client = imageservice(httplib.HTTPConnection(server, port), client = imageservice(httplib.HTTPConnection(server, port),
options.slavetoken) options.slavetoken)
for image in client.get_images(): for image in client.get_images():
logging.debug(_('Considering image: %(image)s') % {'image': image}) logging.debug('Considering image: %(image)s' % {'image': image})
if image['status'] == 'active': if image['status'] == 'active':
total_size += int(image['size']) total_size += int(image['size'])
count += 1 count += 1
@ -354,15 +354,15 @@ def _dict_diff(a, b):
""" """
# Only things the master has which the slave lacks matter # Only things the master has which the slave lacks matter
if set(a.keys()) - set(b.keys()): if set(a.keys()) - set(b.keys()):
logging.debug(_('metadata diff -- master has extra keys: %(keys)s') logging.debug('metadata diff -- master has extra keys: %(keys)s'
% {'keys': ' '.join(set(a.keys()) - set(b.keys()))}) % {'keys': ' '.join(set(a.keys()) - set(b.keys()))})
return True return True
for key in a: for key in a:
if str(a[key]) != str(b[key]): if str(a[key]) != str(b[key]):
logging.debug(_('metadata diff -- value differs for key ' logging.debug('metadata diff -- value differs for key '
'%(key)s: master "%(master_value)s" vs ' '%(key)s: master "%(master_value)s" vs '
'slave "%(slave_value)s"') % 'slave "%(slave_value)s"' %
{'key': key, 'master_value': a[key], {'key': key, 'master_value': a[key],
'slave_value': b[key]}) 'slave_value': b[key]})
return True return True
@ -413,20 +413,20 @@ def replication_load(options, args):
# Remove keys which don't make sense for replication # Remove keys which don't make sense for replication
for key in options.dontreplicate.split(' '): for key in options.dontreplicate.split(' '):
if key in meta: if key in meta:
logging.debug(_('Stripping %(header)s from saved ' logging.debug('Stripping %(header)s from saved '
'metadata'), {'header': key}) 'metadata', {'header': key})
del meta[key] del meta[key]
if _image_present(client, image_uuid): if _image_present(client, image_uuid):
# NOTE(mikal): Perhaps we just need to update the metadata? # NOTE(mikal): Perhaps we just need to update the metadata?
# Note that we don't attempt to change an image file once it # Note that we don't attempt to change an image file once it
# has been uploaded. # has been uploaded.
logging.debug(_('Image %s already present'), image_uuid) logging.debug('Image %s already present', image_uuid)
headers = client.get_image_meta(image_uuid) headers = client.get_image_meta(image_uuid)
for key in options.dontreplicate.split(' '): for key in options.dontreplicate.split(' '):
if key in headers: if key in headers:
logging.debug(_('Stripping %(header)s from slave ' logging.debug('Stripping %(header)s from slave '
'metadata'), {'header': key}) 'metadata', {'header': key})
del headers[key] del headers[key]
if _dict_diff(meta, headers): if _dict_diff(meta, headers):
@ -482,7 +482,7 @@ def replication_livecopy(options, args):
logging.info(_('Considering %(id)s') % {'id': image['id']}) logging.info(_('Considering %(id)s') % {'id': image['id']})
for key in options.dontreplicate.split(' '): for key in options.dontreplicate.split(' '):
if key in image: if key in image:
logging.debug(_('Stripping %(header)s from master metadata'), logging.debug('Stripping %(header)s from master metadata',
{'header': key}) {'header': key})
del image[key] del image[key]
@ -494,12 +494,12 @@ def replication_livecopy(options, args):
if headers['status'] == 'active': if headers['status'] == 'active':
for key in options.dontreplicate.split(' '): for key in options.dontreplicate.split(' '):
if key in image: if key in image:
logging.debug(_('Stripping %(header)s from master ' logging.debug('Stripping %(header)s from master '
'metadata'), {'header': key}) 'metadata', {'header': key})
del image[key] del image[key]
if key in headers: if key in headers:
logging.debug(_('Stripping %(header)s from slave ' logging.debug('Stripping %(header)s from slave '
'metadata'), {'header': key}) 'metadata', {'header': key})
del headers[key] del headers[key]
if _dict_diff(image, headers): if _dict_diff(image, headers):
@ -553,12 +553,12 @@ def replication_compare(options, args):
headers = slave_client.get_image_meta(image['id']) headers = slave_client.get_image_meta(image['id'])
for key in options.dontreplicate.split(' '): for key in options.dontreplicate.split(' '):
if key in image: if key in image:
logging.debug(_('Stripping %(header)s from master ' logging.debug('Stripping %(header)s from master '
'metadata'), {'header': key}) 'metadata', {'header': key})
del image[key] del image[key]
if key in headers: if key in headers:
logging.debug(_('Stripping %(header)s from slave ' logging.debug('Stripping %(header)s from slave '
'metadata'), {'header': key}) 'metadata', {'header': key})
del headers[key] del headers[key]
for key in image: for key in image:
@ -573,7 +573,7 @@ def replication_compare(options, args):
'undefined')}) 'undefined')})
differences[image['id']] = 'diff' differences[image['id']] = 'diff'
else: else:
logging.debug(_('%(image_id)s is identical') logging.debug('%(image_id)s is identical'
% {'image_id': image['id']}) % {'image_id': image['id']})
elif image['status'] == 'active': elif image['status'] == 'active':

4
glance/common/client.py
View File

@ -306,7 +306,7 @@ class BaseClient(object):
<http|https>://<host>:port/doc_root <http|https>://<host>:port/doc_root
""" """
LOG.debug(_("Configuring from URL: %s"), url) LOG.debug("Configuring from URL: %s", url)
parsed = urlparse.urlparse(url) parsed = urlparse.urlparse(url)
self.use_ssl = parsed.scheme == 'https' self.use_ssl = parsed.scheme == 'https'
self.host = parsed.hostname self.host = parsed.hostname
@ -318,7 +318,7 @@ class BaseClient(object):
if self.DEFAULT_DOC_ROOT: if self.DEFAULT_DOC_ROOT:
doc_root = self.DEFAULT_DOC_ROOT.lstrip('/') doc_root = self.DEFAULT_DOC_ROOT.lstrip('/')
self.doc_root += '/' + doc_root self.doc_root += '/' + doc_root
msg = (_("Appending doc_root %(doc_root)s to URL %(url)s") % msg = ("Appending doc_root %(doc_root)s to URL %(url)s" %
{'doc_root': doc_root, 'url': url}) {'doc_root': doc_root, 'url': url})
LOG.debug(msg) LOG.debug(msg)

2
glance/common/config.py
View File

@ -210,7 +210,7 @@ def load_paste_app(app_name, flavor=None, conf_file=None):
try: try:
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.debug(_("Loading %(app_name)s from %(conf_file)s"), logger.debug("Loading %(app_name)s from %(conf_file)s",
{'conf_file': conf_file, 'app_name': app_name}) {'conf_file': conf_file, 'app_name': app_name})
app = deploy.loadapp("config:%s" % conf_file, name=app_name) app = deploy.loadapp("config:%s" % conf_file, name=app_name)

2
glance/common/utils.py
View File

@ -436,7 +436,7 @@ def mutating(func):
@functools.wraps(func) @functools.wraps(func)
def wrapped(self, req, *args, **kwargs): def wrapped(self, req, *args, **kwargs):
if req.context.read_only: if req.context.read_only:
msg = _("Read-only access") msg = "Read-only access"
LOG.debug(msg) LOG.debug(msg)
raise exc.HTTPForbidden(msg, request=req, raise exc.HTTPForbidden(msg, request=req,
content_type="text/plain") content_type="text/plain")

2
glance/common/wsgi.py
View File

@ -275,7 +275,7 @@ class Server(object):
break break
eventlet.greenio.shutdown_safe(self.sock) eventlet.greenio.shutdown_safe(self.sock)
self.sock.close() self.sock.close()
self.logger.debug(_('Exited')) self.logger.debug('Exited')
def wait(self): def wait(self):
"""Wait until all servers have completed running.""" """Wait until all servers have completed running."""

8
glance/db/simple/api.py
View File

@ -737,7 +737,7 @@ def task_update(context, task_id, values):
try: try:
task = DATA['tasks'][task_id] task = DATA['tasks'][task_id]
except KeyError: except KeyError:
msg = (_("No task found with ID %s") % task_id) msg = "No task found with ID %s" % task_id
LOG.debug(msg) LOG.debug(msg)
raise exception.TaskNotFound(task_id=task_id) raise exception.TaskNotFound(task_id=task_id)
@ -769,7 +769,7 @@ def _task_get(context, task_id, force_show_deleted=False):
raise exception.TaskNotFound(task_id=task_id) raise exception.TaskNotFound(task_id=task_id)
if not _is_task_visible(context, task): if not _is_task_visible(context, task):
msg = (_("Forbidding request, task %s is not visible") % task_id) msg = "Forbidding request, task %s is not visible" % task_id
LOG.debug(msg) LOG.debug(msg)
raise exception.Forbidden(msg) raise exception.Forbidden(msg)
@ -787,7 +787,7 @@ def task_delete(context, task_id):
DATA['tasks'][task_id]['updated_at'] = timeutils.utcnow() DATA['tasks'][task_id]['updated_at'] = timeutils.utcnow()
return copy.deepcopy(DATA['tasks'][task_id]) return copy.deepcopy(DATA['tasks'][task_id])
except KeyError: except KeyError:
msg = (_("No task found with ID %s") % task_id) msg = "No task found with ID %s" % task_id
LOG.debug(msg) LOG.debug(msg)
raise exception.TaskNotFound(task_id=task_id) raise exception.TaskNotFound(task_id=task_id)
@ -909,7 +909,7 @@ def _task_info_update(task_id, values):
try: try:
task_info = DATA['task_info'][task_id] task_info = DATA['task_info'][task_id]
except KeyError: except KeyError:
msg = (_("No task info found with task id %s") % task_id) msg = "No task info found with task id %s" % task_id
LOG.debug(msg) LOG.debug(msg)
raise exception.TaskNotFound(task_id=task_id) raise exception.TaskNotFound(task_id=task_id)

10
glance/db/sqlalchemy/api.py
View File

@ -178,13 +178,13 @@ def _image_get(context, image_id, session=None, force_show_deleted=False):
image = query.one() image = query.one()
except sa_orm.exc.NoResultFound: except sa_orm.exc.NoResultFound:
msg = (_("No image found with ID %s") % image_id) msg = "No image found with ID %s" % image_id
LOG.debug(msg) LOG.debug(msg)
raise exception.NotFound(msg) raise exception.NotFound(msg)
# Make sure they can look at it # Make sure they can look at it
if not is_image_visible(context, image): if not is_image_visible(context, image):
msg = (_("Forbidding request, image %s not visible") % image_id) msg = "Forbidding request, image %s not visible" % image_id
LOG.debug(msg) LOG.debug(msg)
raise exception.Forbidden(msg) raise exception.Forbidden(msg)
@ -1081,7 +1081,7 @@ def _task_info_get(context, task_id, session=None):
try: try:
task_info_ref = query.one() task_info_ref = query.one()
except sa_orm.exc.NoResultFound: except sa_orm.exc.NoResultFound:
msg = (_("TaskInfo was not found for task with id %(task_id)s") % msg = ("TaskInfo was not found for task with id %(task_id)s" %
{'task_id': task_id}) {'task_id': task_id})
LOG.debug(msg) LOG.debug(msg)
task_info_ref = None task_info_ref = None
@ -1247,13 +1247,13 @@ def _task_get(context, task_id, session=None, force_show_deleted=False):
try: try:
task_ref = query.one() task_ref = query.one()
except sa_orm.exc.NoResultFound: except sa_orm.exc.NoResultFound:
msg = (_("No task found with ID %s") % task_id) msg = "No task found with ID %s" % task_id
LOG.debug(msg) LOG.debug(msg)
raise exception.TaskNotFound(task_id=task_id) raise exception.TaskNotFound(task_id=task_id)
# Make sure the task is visible # Make sure the task is visible
if not _is_task_visible(context, task_ref): if not _is_task_visible(context, task_ref):
msg = (_("Forbidding request, task %s is not visible") % task_id) msg = "Forbidding request, task %s is not visible" % task_id
LOG.debug(msg) LOG.debug(msg)
raise exception.Forbidden(msg) raise exception.Forbidden(msg)

0
glance/hacking/__init__.py Normal file
View File

36
glance/hacking/checks.py Normal file
View File

@ -0,0 +1,36 @@
# Copyright (c) 2014 OpenStack Foundation.
#
# 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.
def no_translate_debug_logs(logical_line, filename):
dirs = [
"glance/api",
"glance/cmd",
"glance/common",
"glance/db",
"glance/domain",
"glance/image_cache",
"glance/quota",
"glance/registry",
"glance/store",
"glance/tests",
]
if max([name in filename for name in dirs]):
if logical_line.startswith("LOG.debug(_("):
yield(0, "N319: Don't translate debug level logs")
def factory(register):
register(no_translate_debug_logs)

16
glance/image_cache/__init__.py
View File

@ -172,12 +172,12 @@ class ImageCache(object):
max_size = CONF.image_cache_max_size max_size = CONF.image_cache_max_size
current_size = self.driver.get_cache_size() current_size = self.driver.get_cache_size()
if max_size > current_size: if max_size > current_size:
LOG.debug(_("Image cache has free space, skipping prune...")) LOG.debug("Image cache has free space, skipping prune...")
return (0, 0) return (0, 0)
overage = current_size - max_size overage = current_size - max_size
LOG.debug(_("Image cache currently %(overage)d bytes over max " LOG.debug("Image cache currently %(overage)d bytes over max "
"size. Starting prune to max size of %(max_size)d "), "size. Starting prune to max size of %(max_size)d ",
{'overage': overage, 'max_size': max_size}) {'overage': overage, 'max_size': max_size})
total_bytes_pruned = 0 total_bytes_pruned = 0
@ -185,7 +185,7 @@ class ImageCache(object):
entry = self.driver.get_least_recently_accessed() entry = self.driver.get_least_recently_accessed()
while entry and current_size > max_size: while entry and current_size > max_size:
image_id, size = entry image_id, size = entry
LOG.debug(_("Pruning '%(image_id)s' to free %(size)d bytes"), LOG.debug("Pruning '%(image_id)s' to free %(size)d bytes",
{'image_id': image_id, 'size': size}) {'image_id': image_id, 'size': size})
self.driver.delete_cached_image(image_id) self.driver.delete_cached_image(image_id)
total_bytes_pruned = total_bytes_pruned + size total_bytes_pruned = total_bytes_pruned + size
@ -193,9 +193,9 @@ class ImageCache(object):
current_size = current_size - size current_size = current_size - size
entry = self.driver.get_least_recently_accessed() entry = self.driver.get_least_recently_accessed()
LOG.debug(_("Pruning finished pruning. " LOG.debug("Pruning finished pruning. "
"Pruned %(total_files_pruned)d and " "Pruned %(total_files_pruned)d and "
"%(total_bytes_pruned)d."), "%(total_bytes_pruned)d.",
{'total_files_pruned': total_files_pruned, {'total_files_pruned': total_files_pruned,
'total_bytes_pruned': total_bytes_pruned}) 'total_bytes_pruned': total_bytes_pruned})
return total_files_pruned, total_bytes_pruned return total_files_pruned, total_bytes_pruned
@ -232,7 +232,7 @@ class ImageCache(object):
if not self.driver.is_cacheable(image_id): if not self.driver.is_cacheable(image_id):
return image_iter return image_iter
LOG.debug(_("Tee'ing image '%s' into cache"), image_id) LOG.debug("Tee'ing image '%s' into cache", image_id)
return self.cache_tee_iter(image_id, image_iter, image_checksum) return self.cache_tee_iter(image_id, image_iter, image_checksum)

14
glance/image_cache/drivers/sqlite.py
View File

@ -158,7 +158,7 @@ class Driver(base.Driver):
""" """
Returns a list of records about cached images. Returns a list of records about cached images.
""" """
LOG.debug(_("Gathering cached image entries.")) LOG.debug("Gathering cached image entries.")
with self.get_db() as db: with self.get_db() as db:
cur = db.execute("""SELECT cur = db.execute("""SELECT
image_id, hits, last_accessed, last_modified, size image_id, hits, last_accessed, last_modified, size
@ -301,8 +301,8 @@ class Driver(base.Driver):
def commit(): def commit():
with self.get_db() as db: with self.get_db() as db:
final_path = self.get_image_filepath(image_id) final_path = self.get_image_filepath(image_id)
LOG.debug(_("Fetch finished, moving " LOG.debug("Fetch finished, moving "
"'%(incomplete_path)s' to '%(final_path)s'"), "'%(incomplete_path)s' to '%(final_path)s'",
dict(incomplete_path=incomplete_path, dict(incomplete_path=incomplete_path,
final_path=final_path)) final_path=final_path))
os.rename(incomplete_path, final_path) os.rename(incomplete_path, final_path)
@ -325,9 +325,9 @@ class Driver(base.Driver):
if os.path.exists(incomplete_path): if os.path.exists(incomplete_path):
invalid_path = self.get_image_filepath(image_id, 'invalid') invalid_path = self.get_image_filepath(image_id, 'invalid')
LOG.debug(_("Fetch of cache file failed (%(e)s), rolling " LOG.debug("Fetch of cache file failed (%(e)s), rolling "
"back by moving '%(incomplete_path)s' to " "back by moving '%(incomplete_path)s' to "
"'%(invalid_path)s'"), "'%(invalid_path)s'",
{'e': e, {'e': e,
'incomplete_path': incomplete_path, 'incomplete_path': incomplete_path,
'invalid_path': invalid_path}) 'invalid_path': invalid_path})
@ -485,7 +485,7 @@ class Driver(base.Driver):
def delete_cached_file(path): def delete_cached_file(path):
if os.path.exists(path): if os.path.exists(path):
LOG.debug(_("Deleting image cache file '%s'"), path) LOG.debug("Deleting image cache file '%s'", path)
os.unlink(path) os.unlink(path)
else: else:
LOG.warn(_("Cached image file '%s' doesn't exist, unable to" LOG.warn(_("Cached image file '%s' doesn't exist, unable to"

28
glance/image_cache/drivers/xattr.py
View File

@ -142,7 +142,7 @@ class Driver(base.Driver):
""" """
Returns a list of records about cached images. Returns a list of records about cached images.
""" """
LOG.debug(_("Gathering cached image entries.")) LOG.debug("Gathering cached image entries.")
entries = [] entries = []
for path in get_all_regular_files(self.base_dir): for path in get_all_regular_files(self.base_dir):
image_id = os.path.basename(path) image_id = os.path.basename(path)
@ -270,25 +270,25 @@ class Driver(base.Driver):
set_attr('hits', 0) set_attr('hits', 0)
final_path = self.get_image_filepath(image_id) final_path = self.get_image_filepath(image_id)
LOG.debug(_("Fetch finished, moving " LOG.debug("Fetch finished, moving "
"'%(incomplete_path)s' to '%(final_path)s'"), "'%(incomplete_path)s' to '%(final_path)s'",
dict(incomplete_path=incomplete_path, dict(incomplete_path=incomplete_path,
final_path=final_path)) final_path=final_path))
os.rename(incomplete_path, final_path) os.rename(incomplete_path, final_path)
# Make sure that we "pop" the image from the queue... # Make sure that we "pop" the image from the queue...
if self.is_queued(image_id): if self.is_queued(image_id):
LOG.debug(_("Removing image '%s' from queue after " LOG.debug("Removing image '%s' from queue after "
"caching it."), image_id) "caching it.", image_id)
os.unlink(self.get_image_filepath(image_id, 'queue')) os.unlink(self.get_image_filepath(image_id, 'queue'))
def rollback(e): def rollback(e):
set_attr('error', utils.exception_to_str(e)) set_attr('error', utils.exception_to_str(e))
invalid_path = self.get_image_filepath(image_id, 'invalid') invalid_path = self.get_image_filepath(image_id, 'invalid')
LOG.debug(_("Fetch of cache file failed (%(e)s), rolling back by " LOG.debug("Fetch of cache file failed (%(e)s), rolling back by "
"moving '%(incomplete_path)s' to " "moving '%(incomplete_path)s' to "
"'%(invalid_path)s'"), "'%(invalid_path)s'",
{'e': utils.exception_to_str(e), {'e': utils.exception_to_str(e),
'incomplete_path': incomplete_path, 'incomplete_path': incomplete_path,
'invalid_path': invalid_path}) 'invalid_path': invalid_path})
@ -351,7 +351,7 @@ class Driver(base.Driver):
return False return False
path = self.get_image_filepath(image_id, 'queue') path = self.get_image_filepath(image_id, 'queue')
LOG.debug(_("Queueing image '%s'."), image_id) LOG.debug("Queueing image '%s'.", image_id)
# Touch the file to add it to the queue # Touch the file to add it to the queue
with open(path, "w"): with open(path, "w"):
@ -381,13 +381,13 @@ class Driver(base.Driver):
mtime = os.path.getmtime(path) mtime = os.path.getmtime(path)
age = now - mtime age = now - mtime
if not grace: if not grace:
LOG.debug(_("No grace period, reaping '%(path)s'" LOG.debug("No grace period, reaping '%(path)s'"
" immediately"), {'path': path}) " immediately", {'path': path})
delete_cached_file(path) delete_cached_file(path)
reaped += 1 reaped += 1
elif age > grace: elif age > grace:
LOG.debug(_("Cache entry '%(path)s' exceeds grace period, " LOG.debug("Cache entry '%(path)s' exceeds grace period, "
"(%(age)i s > %(grace)i s)"), "(%(age)i s > %(grace)i s)",
{'path': path, 'age': age, 'grace': grace}) {'path': path, 'age': age, 'grace': grace})
delete_cached_file(path) delete_cached_file(path)
reaped += 1 reaped += 1
@ -436,7 +436,7 @@ def get_all_regular_files(basepath):
def delete_cached_file(path): def delete_cached_file(path):
if os.path.exists(path): if os.path.exists(path):
LOG.debug(_("Deleting image cache file '%s'"), path) LOG.debug("Deleting image cache file '%s'", path)
os.unlink(path) os.unlink(path)
else: else:
LOG.warn(_("Cached image file '%s' doesn't exist, unable to" LOG.warn(_("Cached image file '%s' doesn't exist, unable to"

6
glance/image_cache/prefetcher.py
View File

@ -53,7 +53,7 @@ class Prefetcher(base.CacheApp):
location = image_meta['location'] location = image_meta['location']
image_data, image_size = glance.store.get_from_backend(ctx, location) image_data, image_size = glance.store.get_from_backend(ctx, location)
LOG.debug(_("Caching image '%s'"), image_id) LOG.debug("Caching image '%s'", image_id)
cache_tee_iter = self.cache.cache_tee_iter(image_id, image_data, cache_tee_iter = self.cache.cache_tee_iter(image_id, image_data,
image_meta['checksum']) image_meta['checksum'])
# Image is tee'd into cache and checksum verified # Image is tee'd into cache and checksum verified
@ -65,11 +65,11 @@ class Prefetcher(base.CacheApp):
images = self.cache.get_queued_images() images = self.cache.get_queued_images()
if not images: if not images:
LOG.debug(_("Nothing to prefetch.")) LOG.debug("Nothing to prefetch.")
return True return True
num_images = len(images) num_images = len(images)
LOG.debug(_("Found %d images to prefetch"), num_images) LOG.debug("Found %d images to prefetch", num_images)
pool = eventlet.GreenPool(num_images) pool = eventlet.GreenPool(num_images)
results = pool.imap(self.fetch_image_into_cache, images) results = pool.imap(self.fetch_image_into_cache, images)

6
glance/registry/api/v1/images.py
View File

@ -441,9 +441,9 @@ class Controller(object):
purge_props = req.headers.get("X-Glance-Registry-Purge-Props", "false") purge_props = req.headers.get("X-Glance-Registry-Purge-Props", "false")
try: try:
LOG.debug(_("Updating image %(id)s with metadata: " LOG.debug("Updating image %(id)s with metadata: "
"%(image_data)r"), {'id': id, "%(image_data)r", {'id': id,
'image_data': image_data}) 'image_data': image_data})
image_data = _normalize_image_location_for_db(image_data) image_data = _normalize_image_location_for_db(image_data)
if purge_props == "true": if purge_props == "true":
purge_props = True purge_props = True

2
glance/registry/api/v1/members.py
View File

@ -294,7 +294,7 @@ class Controller(object):
if members: if members:
self.db_api.image_member_delete(req.context, members[0]['id']) self.db_api.image_member_delete(req.context, members[0]['id'])
else: else:
msg = (_("%(id)s is not a member of image %(image_id)s") % msg = ("%(id)s is not a member of image %(image_id)s" %
{'id': id, 'image_id': image_id}) {'id': id, 'image_id': image_id})
LOG.debug(msg) LOG.debug(msg)
msg = _("Membership could not be found.") msg = _("Membership could not be found.")

6
glance/registry/client/v1/api.py
View File

@ -156,21 +156,21 @@ def get_image_metadata(context, image_id):
def add_image_metadata(context, image_meta): def add_image_metadata(context, image_meta):
LOG.debug(_("Adding image metadata...")) LOG.debug("Adding image metadata...")
c = get_registry_client(context) c = get_registry_client(context)
return c.add_image(image_meta) return c.add_image(image_meta)
def update_image_metadata(context, image_id, image_meta, def update_image_metadata(context, image_id, image_meta,
purge_props=False, from_state=None): purge_props=False, from_state=None):
LOG.debug(_("Updating image metadata for image %s..."), image_id) LOG.debug("Updating image metadata for image %s...", image_id)
c = get_registry_client(context) c = get_registry_client(context)
return c.update_image(image_id, image_meta, purge_props=purge_props, return c.update_image(image_id, image_meta, purge_props=purge_props,
from_state=from_state) from_state=from_state)
def delete_image_metadata(context, image_id): def delete_image_metadata(context, image_id):
LOG.debug(_("Deleting image metadata for image %s..."), image_id) LOG.debug("Deleting image metadata for image %s...", image_id)
c = get_registry_client(context) c = get_registry_client(context)
return c.delete_image(image_id) return c.delete_image(image_id)

4
glance/registry/client/v1/client.py
View File

@ -108,8 +108,8 @@ class RegistryClient(BaseClient):
**kwargs) **kwargs)
status = res.status status = res.status
request_id = res.getheader('x-openstack-request-id') request_id = res.getheader('x-openstack-request-id')
msg = (_("Registry request %(method)s %(action)s HTTP %(status)s" msg = ("Registry request %(method)s %(action)s HTTP %(status)s"
" request id %(request_id)s") % " request id %(request_id)s" %
{'method': method, 'action': action, {'method': method, 'action': action,
'status': status, 'request_id': request_id}) 'status': status, 'request_id': request_id})
LOG.debug(msg) LOG.debug(msg)

6
glance/scrubber.py
View File

@ -378,10 +378,10 @@ class Daemon(object):
LOG.info(msg) LOG.info(msg)
def _run(self, application): def _run(self, application):
LOG.debug(_("Running application")) LOG.debug("Running application")
self.pool.spawn_n(application.run, self.pool, self.event) self.pool.spawn_n(application.run, self.pool, self.event)
eventlet.spawn_after(self.wakeup_time, self._run, application) eventlet.spawn_after(self.wakeup_time, self._run, application)
LOG.debug(_("Next run scheduled in %s seconds") % self.wakeup_time) LOG.debug("Next run scheduled in %s seconds" % self.wakeup_time)
class Scrubber(object): class Scrubber(object):
@ -449,7 +449,7 @@ class Scrubber(object):
uri = crypt.urlsafe_decrypt(CONF.metadata_encryption_key, uri) uri = crypt.urlsafe_decrypt(CONF.metadata_encryption_key, uri)
try: try:
LOG.debug(_("Deleting URI from image %(image_id)s.") % LOG.debug("Deleting URI from image %(image_id)s." %
{'image_id': image_id}) {'image_id': image_id})
# Here we create a request context with credentials to support # Here we create a request context with credentials to support

12
glance/store/__init__.py
View File

@ -166,7 +166,7 @@ def _register_stores(store_classes):
def _get_store_class(store_entry): def _get_store_class(store_entry):
store_cls = None store_cls = None
try: try:
LOG.debug(_("Attempting to import store %s"), store_entry) LOG.debug("Attempting to import store %s", store_entry)
store_cls = importutils.import_class(store_entry) store_cls = importutils.import_class(store_entry)
except exception.NotFound: except exception.NotFound:
raise BackendException('Unable to load store. ' raise BackendException('Unable to load store. '
@ -208,9 +208,9 @@ def create_stores():
% store_cls) % store_cls)
else: else:
if store_cls not in store_classes: if store_cls not in store_classes:
LOG.debug(_("Registering store %(cls)s with schemes " LOG.debug("Registering store %(cls)s with schemes "
"%(schemes)s"), {'cls': store_cls, "%(schemes)s", {'cls': store_cls,
'schemes': schemes}) 'schemes': schemes})
store_classes.add(store_cls) store_classes.add(store_cls)
scheme_map = {} scheme_map = {}
for scheme in schemes: for scheme in schemes:
@ -222,7 +222,7 @@ def create_stores():
location.register_scheme_map(scheme_map) location.register_scheme_map(scheme_map)
store_count += 1 store_count += 1
else: else:
LOG.debug(_("Store %s already registered"), store_cls) LOG.debug("Store %s already registered", store_cls)
_register_stores(store_classes) _register_stores(store_classes)
return store_count return store_count
@ -426,7 +426,7 @@ def set_acls(context, location_uri, public=False, read_tenants=None,
store.set_acls(loc, public=public, read_tenants=read_tenants, store.set_acls(loc, public=public, read_tenants=read_tenants,
write_tenants=write_tenants) write_tenants=write_tenants)
except NotImplementedError: except NotImplementedError:
LOG.debug(_("Skipping store.set_acls... not implemented.")) LOG.debug("Skipping store.set_acls... not implemented.")
class ImageRepoProxy(glance.domain.proxy.Repo): class ImageRepoProxy(glance.domain.proxy.Repo):

2
glance/store/base.py
View File

@ -65,7 +65,7 @@ class Store(object):
""" """
if not self.store_location_class: if not self.store_location_class:
class_name = "%s.StoreLocation" % (self.__module__) class_name = "%s.StoreLocation" % (self.__module__)
LOG.debug(_("Late loading location class %s"), class_name) LOG.debug("Late loading location class %s", class_name)
self.store_location_class = importutils.import_class(class_name) self.store_location_class = importutils.import_class(class_name)
return self.store_location_class return self.store_location_class

2
glance/store/cinder.py
View File

@ -85,7 +85,7 @@ def get_cinderclient(context):
service_name=service_name, service_name=service_name,
endpoint_type=endpoint_type) endpoint_type=endpoint_type)
LOG.debug(_('Cinderclient connection created using URL: %s') % url) LOG.debug('Cinderclient connection created using URL: %s' % url)
c = cinderclient.Client(context.user, c = cinderclient.Client(context.user,
context.auth_tok, context.auth_tok,

12
glance/store/filesystem.py
View File

@ -75,7 +75,7 @@ class StoreLocation(glance.store.location.StoreLocation):
self.scheme = pieces.scheme self.scheme = pieces.scheme
path = (pieces.netloc + pieces.path).strip() path = (pieces.netloc + pieces.path).strip()
if path == '': if path == '':
reason = _("No path specified in URI: %s") % uri reason = "No path specified in URI: %s" % uri
LOG.debug(reason) LOG.debug(reason)
raise exception.BadStoreUri('No path specified') raise exception.BadStoreUri('No path specified')
self.path = path self.path = path
@ -307,7 +307,7 @@ class Store(glance.store.base.Store):
:raises `glance.exception.NotFound` if image does not exist :raises `glance.exception.NotFound` if image does not exist
""" """
filepath, filesize = self._resolve_location(location) filepath, filesize = self._resolve_location(location)
msg = _("Found image at %s. Returning in ChunkedFile.") % filepath msg = "Found image at %s. Returning in ChunkedFile." % filepath
LOG.debug(msg) LOG.debug(msg)
return (ChunkedFile(filepath), filesize) return (ChunkedFile(filepath), filesize)
@ -322,7 +322,7 @@ class Store(glance.store.base.Store):
:rtype int :rtype int
""" """
filepath, filesize = self._resolve_location(location) filepath, filesize = self._resolve_location(location)
msg = _("Found image at %s.") % filepath msg = "Found image at %s." % filepath
LOG.debug(msg) LOG.debug(msg)
return filesize return filesize
@ -341,7 +341,7 @@ class Store(glance.store.base.Store):
fn = loc.path fn = loc.path
if os.path.exists(fn): if os.path.exists(fn):
try: try:
LOG.debug(_("Deleting image at %(fn)s"), {'fn': fn}) LOG.debug("Deleting image at %(fn)s", {'fn': fn})
os.unlink(fn) os.unlink(fn)
except OSError: except OSError:
raise exception.Forbidden(_("You cannot delete file %s") % fn) raise exception.Forbidden(_("You cannot delete file %s") % fn)
@ -448,8 +448,8 @@ class Store(glance.store.base.Store):
checksum_hex = checksum.hexdigest() checksum_hex = checksum.hexdigest()
metadata = self._get_metadata() metadata = self._get_metadata()
LOG.debug(_("Wrote %(bytes_written)d bytes to %(filepath)s with " LOG.debug("Wrote %(bytes_written)d bytes to %(filepath)s with "
"checksum %(checksum_hex)s"), "checksum %(checksum_hex)s",
{'bytes_written': bytes_written, {'bytes_written': bytes_written,
'filepath': filepath, 'filepath': filepath,
'checksum_hex': checksum_hex}) 'checksum_hex': checksum_hex})

20
glance/store/gridfs.py
View File

@ -154,8 +154,8 @@ class Store(glance.store.base.Store):
parsed = urlparse.urlparse(store_location.get_uri()) parsed = urlparse.urlparse(store_location.get_uri())
return self.fs.get(parsed.netloc) return self.fs.get(parsed.netloc)
except gridfs.errors.NoFile: except gridfs.errors.NoFile:
msg = _("Could not find %s image in GridFS") % \ msg = ("Could not find %s image in GridFS"
store_location.get_uri() % store_location.get_uri())
LOG.debug(msg) LOG.debug(msg)
raise exception.NotFound(msg) raise exception.NotFound(msg)
@ -180,9 +180,9 @@ class Store(glance.store.base.Store):
raise exception.Duplicate(_("GridFS already has an image at " raise exception.Duplicate(_("GridFS already has an image at "
"location %s") % loc.get_uri()) "location %s") % loc.get_uri())
LOG.debug(_("Adding a new image to GridFS with id %(id)s and " LOG.debug("Adding a new image to GridFS with id %(id)s and "
"size %(size)s") % {'id': image_id, "size %(size)s" % {'id': image_id,
'size': image_size}) 'size': image_size})
try: try:
self.fs.put(image_file, _id=image_id) self.fs.put(image_file, _id=image_id)
@ -193,10 +193,10 @@ class Store(glance.store.base.Store):
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
self.fs.delete(image_id) self.fs.delete(image_id)
LOG.debug(_("Uploaded image %(id)s, md5 %(md5)s, length %(length)s " LOG.debug("Uploaded image %(id)s, md5 %(md5)s, length %(length)s "
"to GridFS") % {'id': image._id, "to GridFS" % {'id': image._id,
'md5': image.md5, 'md5': image.md5,
'length': image.length}) 'length': image.length})
return (loc.get_uri(), image.length, image.md5, {}) return (loc.get_uri(), image.length, image.md5, {})
@ -212,4 +212,4 @@ class Store(glance.store.base.Store):
""" """
image = self._get_file(location) image = self._get_file(location)
self.fs.delete(image._id) self.fs.delete(image._id)
LOG.debug(_("Deleted image %s from GridFS"), image._id) LOG.debug("Deleted image %s from GridFS", image._id)

4
glance/store/location.py
View File

@ -82,8 +82,8 @@ def register_scheme_map(scheme_map):
""" """
for (k, v) in scheme_map.items(): for (k, v) in scheme_map.items():
if k not in SCHEME_TO_CLS_MAP: if k not in SCHEME_TO_CLS_MAP:
LOG.debug(_("Registering scheme %(k)s with %(v)s") % {'k': k, LOG.debug("Registering scheme %(k)s with %(v)s" % {'k': k,
'v': v}) 'v': v})
SCHEME_TO_CLS_MAP[k] = v SCHEME_TO_CLS_MAP[k] = v

42
glance/store/rbd.py
View File

@ -106,17 +106,17 @@ class StoreLocation(glance.store.location.StoreLocation):
prefix = 'rbd://' prefix = 'rbd://'
if not uri.startswith(prefix): if not uri.startswith(prefix):
reason = _('URI must start with rbd://') reason = _('URI must start with rbd://')
msg = (_("Invalid URI: %(uri)s: %(reason)s") % {'uri': uri, msg = "Invalid URI: %(uri)s: %(reason)s" % {'uri': uri,
'reason': reason}) 'reason': reason}
LOG.debug(msg) LOG.debug(msg)
raise exception.BadStoreUri(message=reason) raise exception.BadStoreUri(message=reason)
# convert to ascii since librbd doesn't handle unicode # convert to ascii since librbd doesn't handle unicode
try: try:
ascii_uri = str(uri) ascii_uri = str(uri)
except UnicodeError: except UnicodeError:
reason = _('URI contains non-ascii characters') reason = 'URI contains non-ascii characters'
msg = (_("Invalid URI: %(uri)s: %(reason)s") % {'uri': uri, msg = "Invalid URI: %(uri)s: %(reason)s" % {'uri': uri,
'reason': reason}) 'reason': reason}
LOG.debug(msg) LOG.debug(msg)
raise exception.BadStoreUri(message=reason) raise exception.BadStoreUri(message=reason)
pieces = ascii_uri[len(prefix):].split('/') pieces = ascii_uri[len(prefix):].split('/')
@ -127,15 +127,15 @@ class StoreLocation(glance.store.location.StoreLocation):
self.fsid, self.pool, self.image, self.snapshot = \ self.fsid, self.pool, self.image, self.snapshot = \
map(urlparse.unquote, pieces) map(urlparse.unquote, pieces)
else: else:
reason = _('URI must have exactly 1 or 4 components') reason = 'URI must have exactly 1 or 4 components'
msg = (_("Invalid URI: %(uri)s: %(reason)s") % {'uri': uri, msg = "Invalid URI: %(uri)s: %(reason)s" % {'uri': uri,
'reason': reason}) 'reason': reason}
LOG.debug(msg) LOG.debug(msg)
raise exception.BadStoreUri(message=reason) raise exception.BadStoreUri(message=reason)
if any(map(lambda p: p == '', pieces)): if any(map(lambda p: p == '', pieces)):
reason = _('URI cannot contain empty components') reason = 'URI cannot contain empty components'
msg = (_("Invalid URI: %(uri)s: %(reason)s") % {'uri': uri, msg = "Invalid URI: %(uri)s: %(reason)s" % {'uri': uri,
'reason': reason}) 'reason': reason}
LOG.debug(msg) LOG.debug(msg)
raise exception.BadStoreUri(message=reason) raise exception.BadStoreUri(message=reason)
@ -233,7 +233,7 @@ class Store(glance.store.base.Store):
img_info = image.stat() img_info = image.stat()
return img_info['size'] return img_info['size']
except rbd.ImageNotFound: except rbd.ImageNotFound:
msg = _('RBD image %s does not exist') % loc.get_uri() msg = 'RBD image %s does not exist' % loc.get_uri()
LOG.debug(msg) LOG.debug(msg)
raise exception.NotFound(msg) raise exception.NotFound(msg)
@ -280,9 +280,9 @@ class Store(glance.store.base.Store):
try: try:
image.unprotect_snap(snapshot_name) image.unprotect_snap(snapshot_name)
except rbd.ImageBusy: except rbd.ImageBusy:
log_msg = _("snapshot %(image)s@%(snap)s " log_msg = ("snapshot %(image)s@%(snap)s "
"could not be unprotected because " "could not be unprotected because "
"it is in use") "it is in use")
LOG.debug(log_msg % LOG.debug(log_msg %
{'image': image_name, {'image': image_name,
'snap': snapshot_name}) 'snap': snapshot_name})
@ -295,8 +295,8 @@ class Store(glance.store.base.Store):
raise exception.NotFound( raise exception.NotFound(
_("RBD image %s does not exist") % image_name) _("RBD image %s does not exist") % image_name)
except rbd.ImageBusy: except rbd.ImageBusy:
log_msg = _("image %s could not be removed " log_msg = ("image %s could not be removed "
"because it is in use") "because it is in use")
LOG.debug(log_msg % image_name) LOG.debug(log_msg % image_name)
raise exception.InUseByStore() raise exception.InUseByStore()
@ -323,8 +323,8 @@ class Store(glance.store.base.Store):
fsid = conn.get_fsid() fsid = conn.get_fsid()
with conn.open_ioctx(self.pool) as ioctx: with conn.open_ioctx(self.pool) as ioctx:
order = int(math.log(self.chunk_size, 2)) order = int(math.log(self.chunk_size, 2))
LOG.debug(_('creating image %(name)s with order %(order)d and ' LOG.debug('creating image %(name)s with order %(order)d and '
'size %(size)d'), 'size %(size)d',
{'name': text_type(image_name), {'name': text_type(image_name),
'order': order, 'order': order,
'size': image_size}) 'size': image_size})
@ -354,10 +354,10 @@ class Store(glance.store.base.Store):
chunk_length = len(chunk) chunk_length = len(chunk)
length = offset + chunk_length length = offset + chunk_length
bytes_written += chunk_length bytes_written += chunk_length
LOG.debug(_("resizing image to %s KiB") % LOG.debug("resizing image to %s KiB" %
(length / units.Ki)) (length / units.Ki))
image.resize(length) image.resize(length)
LOG.debug(_("writing chunk at offset %s") % LOG.debug("writing chunk at offset %s" %
(offset)) (offset))
offset += image.write(chunk, offset) offset += image.write(chunk, offset)
checksum.update(chunk) checksum.update(chunk)

76
glance/store/s3.py
View File

@ -112,15 +112,15 @@ class StoreLocation(glance.store.location.StoreLocation):
# s3://accesskey:secretkey@https://s3.amazonaws.com/bucket/key-id # s3://accesskey:secretkey@https://s3.amazonaws.com/bucket/key-id
# are immediately rejected. # are immediately rejected.
if uri.count('://') != 1: if uri.count('://') != 1:
reason = _("URI cannot contain more than one occurrence " reason = ("URI cannot contain more than one occurrence "
"of a scheme. If you have specified a URI like " "of a scheme. If you have specified a URI like "
"s3://accesskey:secretkey@" "s3://accesskey:secretkey@"
"https://s3.amazonaws.com/bucket/key-id" "https://s3.amazonaws.com/bucket/key-id"
", you need to change it to use the " ", you need to change it to use the "
"s3+https:// scheme, like so: " "s3+https:// scheme, like so: "
"s3+https://accesskey:secretkey@" "s3+https://accesskey:secretkey@"
"s3.amazonaws.com/bucket/key-id") "s3.amazonaws.com/bucket/key-id")
LOG.debug(_("Invalid store uri: %s") % reason) LOG.debug("Invalid store uri: %s" % reason)
raise exception.BadStoreUri(message=reason) raise exception.BadStoreUri(message=reason)
pieces = urlparse.urlparse(uri) pieces = urlparse.urlparse(uri)
@ -146,7 +146,7 @@ class StoreLocation(glance.store.location.StoreLocation):
self.accesskey = access_key self.accesskey = access_key
self.secretkey = secret_key self.secretkey = secret_key
except IndexError: except IndexError:
reason = _("Badly formed S3 credentials %s") % creds reason = "Badly formed S3 credentials %s" % creds
LOG.debug(reason) LOG.debug(reason)
raise exception.BadStoreUri() raise exception.BadStoreUri()
else: else:
@ -162,7 +162,7 @@ class StoreLocation(glance.store.location.StoreLocation):
reason = _("Badly formed S3 URI. Missing s3 service URL.") reason = _("Badly formed S3 URI. Missing s3 service URL.")
raise exception.BadStoreUri() raise exception.BadStoreUri()
except IndexError: except IndexError:
reason = _("Badly formed S3 URI: %s") % uri reason = "Badly formed S3 URI: %s" % uri
LOG.debug(reason) LOG.debug(reason)
raise exception.BadStoreUri() raise exception.BadStoreUri()
@ -249,8 +249,8 @@ class Store(glance.store.base.Store):
def _option_get(self, param): def _option_get(self, param):
result = getattr(CONF, param) result = getattr(CONF, param)
if not result: if not result:
reason = (_("Could not find %(param)s in configuration " reason = ("Could not find %(param)s in configuration "
"options.") % {'param': param}) "options." % {'param': param})
LOG.debug(reason) LOG.debug(reason)
raise exception.BadStoreConfiguration(store_name="s3", raise exception.BadStoreConfiguration(store_name="s3",
reason=reason) reason=reason)
@ -304,12 +304,12 @@ class Store(glance.store.base.Store):
key = get_key(bucket_obj, loc.key) key = get_key(bucket_obj, loc.key)
msg = _("Retrieved image object from S3 using (s3_host=%(s3_host)s, " msg = ("Retrieved image object from S3 using (s3_host=%(s3_host)s, "
"access_key=%(accesskey)s, bucket=%(bucket)s, " "access_key=%(accesskey)s, bucket=%(bucket)s, "
"key=%(obj_name)s)") % ({'s3_host': loc.s3serviceurl, "key=%(obj_name)s)" % ({'s3_host': loc.s3serviceurl,
'accesskey': loc.accesskey, 'accesskey': loc.accesskey,
'bucket': loc.bucket, 'bucket': loc.bucket,
'obj_name': loc.key}) 'obj_name': loc.key}))
LOG.debug(msg) LOG.debug(msg)
return key return key
@ -368,12 +368,12 @@ class Store(glance.store.base.Store):
"location %s") % "location %s") %
_sanitize(loc.get_uri())) _sanitize(loc.get_uri()))
msg = _("Adding image object to S3 using (s3_host=%(s3_host)s, " msg = ("Adding image object to S3 using (s3_host=%(s3_host)s, "
"access_key=%(access_key)s, bucket=%(bucket)s, " "access_key=%(access_key)s, bucket=%(bucket)s, "
"key=%(obj_name)s)") % ({'s3_host': self.s3_host, "key=%(obj_name)s)" % ({'s3_host': self.s3_host,
'access_key': self.access_key, 'access_key': self.access_key,
'bucket': self.bucket, 'bucket': self.bucket,
'obj_name': obj_name}) 'obj_name': obj_name}))
LOG.debug(msg) LOG.debug(msg)
key = bucket_obj.new_key(obj_name) key = bucket_obj.new_key(obj_name)
@ -390,8 +390,8 @@ class Store(glance.store.base.Store):
# take this opportunity to calculate the image checksum while # take this opportunity to calculate the image checksum while
# writing the tempfile, so we don't need to call key.compute_md5() # writing the tempfile, so we don't need to call key.compute_md5()
msg = _("Writing request body file to temporary file " msg = ("Writing request body file to temporary file "
"for %s") % _sanitize(loc.get_uri()) "for %s" % _sanitize(loc.get_uri()))
LOG.debug(msg) LOG.debug(msg)
tmpdir = self.s3_store_object_buffer_dir tmpdir = self.s3_store_object_buffer_dir
@ -402,7 +402,7 @@ class Store(glance.store.base.Store):
temp_file.write(chunk) temp_file.write(chunk)
temp_file.flush() temp_file.flush()
msg = (_("Uploading temporary file to S3 for %s") % msg = ("Uploading temporary file to S3 for %s" %
_sanitize(loc.get_uri())) _sanitize(loc.get_uri()))
LOG.debug(msg) LOG.debug(msg)
@ -411,8 +411,8 @@ class Store(glance.store.base.Store):
size = key.size size = key.size
checksum_hex = checksum.hexdigest() checksum_hex = checksum.hexdigest()
LOG.debug(_("Wrote %(size)d bytes to S3 key named %(obj_name)s " LOG.debug("Wrote %(size)d bytes to S3 key named %(obj_name)s "
"with checksum %(checksum_hex)s"), "with checksum %(checksum_hex)s",
{'size': size, 'obj_name': obj_name, {'size': size, 'obj_name': obj_name,
'checksum_hex': checksum_hex}) 'checksum_hex': checksum_hex})
@ -439,12 +439,12 @@ class Store(glance.store.base.Store):
# Close the key when we're through. # Close the key when we're through.
key = get_key(bucket_obj, loc.key) key = get_key(bucket_obj, loc.key)
msg = _("Deleting image object from S3 using (s3_host=%(s3_host)s, " msg = ("Deleting image object from S3 using (s3_host=%(s3_host)s, "
"access_key=%(accesskey)s, bucket=%(bucket)s, " "access_key=%(accesskey)s, bucket=%(bucket)s, "
"key=%(obj_name)s)") % ({'s3_host': loc.s3serviceurl, "key=%(obj_name)s)" % ({'s3_host': loc.s3serviceurl,
'accesskey': loc.accesskey, 'accesskey': loc.accesskey,
'bucket': loc.bucket, 'bucket': loc.bucket,
'obj_name': loc.key}) 'obj_name': loc.key}))
LOG.debug(msg) LOG.debug(msg)
return key.delete() return key.delete()
@ -461,7 +461,7 @@ def get_bucket(conn, bucket_id):
bucket = conn.get_bucket(bucket_id) bucket = conn.get_bucket(bucket_id)
if not bucket: if not bucket:
msg = _("Could not find bucket with ID %s") % bucket_id msg = "Could not find bucket with ID %s" % bucket_id
LOG.debug(msg) LOG.debug(msg)
raise exception.NotFound(msg) raise exception.NotFound(msg)
@ -525,7 +525,7 @@ def get_key(bucket, obj):
key = bucket.get_key(obj) key = bucket.get_key(obj)
if not key or not key.exists(): if not key or not key.exists():
msg = (_("Could not find key %(obj)s in bucket %(bucket)s") % msg = ("Could not find key %(obj)s in bucket %(bucket)s" %
{'obj': obj, 'bucket': bucket}) {'obj': obj, 'bucket': bucket})
LOG.debug(msg) LOG.debug(msg)
raise exception.NotFound(msg) raise exception.NotFound(msg)

44
glance/store/swift.py
View File

@ -211,13 +211,13 @@ class StoreLocation(glance.store.location.StoreLocation):
# swift://user:pass@http://authurl.com/v1/container/obj # swift://user:pass@http://authurl.com/v1/container/obj
# are immediately rejected. # are immediately rejected.
if uri.count('://') != 1: if uri.count('://') != 1:
reason = _("URI cannot contain more than one occurrence " reason = ("URI cannot contain more than one occurrence "
"of a scheme. If you have specified a URI like " "of a scheme. If you have specified a URI like "
"swift://user:pass@http://authurl.com/v1/container/obj" "swift://user:pass@http://authurl.com/v1/container/obj"
", you need to change it to use the " ", you need to change it to use the "
"swift+http:// scheme, like so: " "swift+http:// scheme, like so: "
"swift+http://user:pass@authurl.com/v1/container/obj") "swift+http://user:pass@authurl.com/v1/container/obj")
LOG.debug(_("Invalid store URI: %(reason)s"), {'reason': reason}) LOG.debug("Invalid store URI: %(reason)s", {'reason': reason})
raise exception.BadStoreUri(message=reason) raise exception.BadStoreUri(message=reason)
pieces = urlparse.urlparse(uri) pieces = urlparse.urlparse(uri)
@ -243,7 +243,7 @@ class StoreLocation(glance.store.location.StoreLocation):
if creds: if creds:
cred_parts = creds.split(':') cred_parts = creds.split(':')
if len(cred_parts) != 2: if len(cred_parts) != 2:
reason = (_("Badly formed credentials in Swift URI.")) reason = "Badly formed credentials in Swift URI."
LOG.debug(reason) LOG.debug(reason)
raise exception.BadStoreUri() raise exception.BadStoreUri()
user, key = cred_parts user, key = cred_parts
@ -261,7 +261,7 @@ class StoreLocation(glance.store.location.StoreLocation):
path_parts.insert(0, netloc) path_parts.insert(0, netloc)
self.auth_or_store_url = '/'.join(path_parts) self.auth_or_store_url = '/'.join(path_parts)
except IndexError: except IndexError:
reason = _("Badly formed Swift URI.") reason = "Badly formed Swift URI."
LOG.debug(reason) LOG.debug(reason)
raise exception.BadStoreUri() raise exception.BadStoreUri()
@ -372,7 +372,7 @@ class BaseStore(glance.store.base.Store):
def _delete_stale_chunks(self, connection, container, chunk_list): def _delete_stale_chunks(self, connection, container, chunk_list):
for chunk in chunk_list: for chunk in chunk_list:
LOG.debug(_("Deleting chunk %s") % chunk) LOG.debug("Deleting chunk %s" % chunk)
try: try:
connection.delete_object(container, chunk) connection.delete_object(container, chunk)
except Exception: except Exception:
@ -388,8 +388,8 @@ class BaseStore(glance.store.base.Store):
self._create_container_if_missing(location.container, connection) self._create_container_if_missing(location.container, connection)
LOG.debug(_("Adding image object '%(obj_name)s' " LOG.debug("Adding image object '%(obj_name)s' "
"to Swift") % dict(obj_name=location.obj)) "to Swift" % dict(obj_name=location.obj))
try: try:
if image_size > 0 and image_size < self.large_object_size: if image_size > 0 and image_size < self.large_object_size:
# Image size is known, and is less than large_object_size. # Image size is known, and is less than large_object_size.
@ -408,8 +408,8 @@ class BaseStore(glance.store.base.Store):
# image_size == 0 is when we don't know the size # image_size == 0 is when we don't know the size
# of the image. This can occur with older clients # of the image. This can occur with older clients
# that don't inspect the payload size. # that don't inspect the payload size.
LOG.debug(_("Cannot determine image size. Adding as a " LOG.debug("Cannot determine image size. Adding as a "
"segmented object to Swift.")) "segmented object to Swift.")
total_chunks = '?' total_chunks = '?'
checksum = hashlib.md5() checksum = hashlib.md5()
@ -444,10 +444,10 @@ class BaseStore(glance.store.base.Store):
written_chunks) written_chunks)
bytes_read = reader.bytes_read bytes_read = reader.bytes_read
msg = (_("Wrote chunk %(chunk_name)s (%(chunk_id)d/" msg = ("Wrote chunk %(chunk_name)s (%(chunk_id)d/"
"%(total_chunks)s) of length %(bytes_read)d " "%(total_chunks)s) of length %(bytes_read)d "
"to Swift returning MD5 of content: " "to Swift returning MD5 of content: "
"%(chunk_etag)s") % "%(chunk_etag)s" %
{'chunk_name': chunk_name, {'chunk_name': chunk_name,
'chunk_id': chunk_id, 'chunk_id': chunk_id,
'total_chunks': total_chunks, 'total_chunks': total_chunks,
@ -458,7 +458,7 @@ class BaseStore(glance.store.base.Store):
if bytes_read == 0: if bytes_read == 0:
# Delete the last chunk, because it's of zero size. # Delete the last chunk, because it's of zero size.
# This will happen if size == 0. # This will happen if size == 0.
LOG.debug(_("Deleting final zero-length chunk")) LOG.debug("Deleting final zero-length chunk")
connection.delete_object(location.container, connection.delete_object(location.container,
chunk_name) chunk_name)
break break
@ -607,7 +607,7 @@ class SingleTenantStore(BaseStore):
def get_connection(self, location): def get_connection(self, location):
if not location.user: if not location.user:
reason = (_("Location is missing user:password information.")) reason = "Location is missing user:password information."
LOG.debug(reason) LOG.debug(reason)
raise exception.BadStoreUri(message=reason) raise exception.BadStoreUri(message=reason)
@ -619,8 +619,8 @@ class SingleTenantStore(BaseStore):
try: try:
tenant_name, user = location.user.split(':') tenant_name, user = location.user.split(':')
except ValueError: except ValueError:
reason = (_("Badly formed tenant:user '%(user)s' in " reason = ("Badly formed tenant:user '%(user)s' in "
"Swift URI") % {'user': location.user}) "Swift URI" % {'user': location.user})
LOG.debug(reason) LOG.debug(reason)
raise exception.BadStoreUri() raise exception.BadStoreUri()
else: else:

15
glance/store/vmware_datastore.py
View File

@ -178,8 +178,7 @@ class StoreLocation(glance.store.location.StoreLocation):
self.path = path self.path = path
self.query = query self.query = query
return return
reason = (_('Badly formed VMware datastore URI %(uri)s.') reason = 'Badly formed VMware datastore URI %(uri)s.' % {'uri': uri}
% {'uri': uri})
LOG.debug(reason) LOG.debug(reason)
raise exception.BadStoreUri(reason) raise exception.BadStoreUri(reason)
@ -361,8 +360,8 @@ class Store(glance.store.base.Store):
def _query(self, location, method, headers, depth=0): def _query(self, location, method, headers, depth=0):
if depth > MAX_REDIRECTS: if depth > MAX_REDIRECTS:
msg = (_("The HTTP URL exceeded %(max_redirects)s maximum " msg = ("The HTTP URL exceeded %(max_redirects)s maximum "
"redirects.") % {'max_redirects': MAX_REDIRECTS}) "redirects." % {'max_redirects': MAX_REDIRECTS})
LOG.debug(msg) LOG.debug(msg)
raise exception.MaxRedirectsExceeded(redirects=MAX_REDIRECTS) raise exception.MaxRedirectsExceeded(redirects=MAX_REDIRECTS)
loc = location.store_location loc = location.store_location
@ -375,18 +374,18 @@ class Store(glance.store.base.Store):
{'image': location.image_id}) {'image': location.image_id})
if resp.status >= 400: if resp.status >= 400:
if resp.status == httplib.NOT_FOUND: if resp.status == httplib.NOT_FOUND:
msg = _('VMware datastore could not find image at URI.') msg = 'VMware datastore could not find image at URI.'
LOG.debug(msg) LOG.debug(msg)
raise exception.NotFound(msg) raise exception.NotFound(msg)
msg = (_('HTTP request returned a %(status)s status code.') msg = ('HTTP request returned a %(status)s status code.'
% {'status': resp.status}) % {'status': resp.status})
LOG.debug(msg) LOG.debug(msg)
raise exception.BadStoreUri(msg) raise exception.BadStoreUri(msg)
location_header = resp.getheader('location') location_header = resp.getheader('location')
if location_header: if location_header:
if resp.status not in (301, 302): if resp.status not in (301, 302):
msg = (_("The HTTP URL %(path)s attempted to redirect " msg = ("The HTTP URL %(path)s attempted to redirect "
"with an invalid %(status)s status code.") "with an invalid %(status)s status code."
% {'path': loc.path, 'status': resp.status}) % {'path': loc.path, 'status': resp.status})
LOG.debug(msg) LOG.debug(msg)
raise exception.BadStoreUri(msg) raise exception.BadStoreUri(msg)

4
glance/tests/unit/test_migrations.py
View File

@ -140,7 +140,7 @@ class TestMigrations(test_utils.BaseTestCase):
# Load test databases from the config file. Only do this # Load test databases from the config file. Only do this
# once. No need to re-run this on each test... # once. No need to re-run this on each test...
LOG.debug(_('config_path is %s'), LOG.debug('config_path is %s',
text_type(TestMigrations.CONFIG_FILE_PATH)) text_type(TestMigrations.CONFIG_FILE_PATH))
if os.path.exists(TestMigrations.CONFIG_FILE_PATH): if os.path.exists(TestMigrations.CONFIG_FILE_PATH):
cp = ConfigParser.RawConfigParser() cp = ConfigParser.RawConfigParser()
@ -334,7 +334,7 @@ class TestMigrations(test_utils.BaseTestCase):
init_version + 1) init_version + 1)
self.assertEqual(init_version + 1, db_version()) self.assertEqual(init_version + 1, db_version())
LOG.debug(_('latest version is %s'), TestMigrations.REPOSITORY.latest) LOG.debug('latest version is %s', TestMigrations.REPOSITORY.latest)
for version in xrange(init_version + 2, for version in xrange(init_version + 2,
TestMigrations.REPOSITORY.latest + 1): TestMigrations.REPOSITORY.latest + 1):

3
tox.ini
View File

@ -40,3 +40,6 @@ commands = {posargs}
ignore = E711,E712,F821,H302,H402,H404 ignore = E711,E712,F821,H302,H402,H404
builtins = _ builtins = _
exclude = .venv,.git,.tox,dist,doc,etc,*glance/locale*,*openstack/common*,*lib/python*,*egg,build exclude = .venv,.git,.tox,dist,doc,etc,*glance/locale*,*openstack/common*,*lib/python*,*egg,build
[hacking]
local-check-factory = glance.hacking.checks.factory