openstack/nova
Code Issues Proposed changes

trivial: Remove remaining '_LW' instances

Browse Source 
There are only a few of these remaining in the code base. Remove them.

Change-Id: I33725e2439b0f39c1e9bec9e33a37bf3e24944fb
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane
2020-05-18 16:56:35 +01:00
parent eee57f2380
commit 3a28b0e771
10 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nova/debugger.py
View File

@@ -37,7 +37,6 @@ def init():
if not (CONF.remote_debug.host and CONF.remote_debug.port): if not (CONF.remote_debug.host and CONF.remote_debug.port):
return return
from nova.i18n import _LW
from oslo_log import log as logging from oslo_log import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -49,12 +48,13 @@ def init():
from pydev import pydevd from pydev import pydevd
except ImportError: except ImportError:
import pydevd import pydevd
pydevd.settrace(host=CONF.remote_debug.host, pydevd.settrace(host=CONF.remote_debug.host,
port=CONF.remote_debug.port, port=CONF.remote_debug.port,
stdoutToServer=False, stdoutToServer=False,
stderrToServer=False) stderrToServer=False)
LOG.warning(_LW('WARNING: Using the remote debug option changes how ' LOG.warning('WARNING: Using the remote debug option changes how '
'Nova uses the eventlet library to support async IO. This ' 'Nova uses the eventlet library to support async IO. This '
'could result in failures that do not occur under normal ' 'could result in failures that do not occur under normal '
'operation. Use at your own risk.')) 'operation. Use at your own risk.')

6
nova/hooks.py
View File

@@ -50,7 +50,7 @@ import functools
from oslo_log import log as logging from oslo_log import log as logging
import stevedore import stevedore
from nova.i18n import _, _LW from nova.i18n import _
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
NS = 'nova.hooks' NS = 'nova.hooks'
@@ -86,8 +86,8 @@ class HookManager(stevedore.hook.HookManager):
obj = e.obj obj = e.obj
hook_method = getattr(obj, method_type, None) hook_method = getattr(obj, method_type, None)
if hook_method: if hook_method:
LOG.warning(_LW("Hooks are deprecated as of Nova 13.0 and " LOG.warning("Hooks are deprecated as of Nova 13.0 and "
"will be removed in a future release")) "will be removed in a future release")
LOG.debug("Running %(name)s %(type)s-hook: %(obj)s", LOG.debug("Running %(name)s %(type)s-hook: %(obj)s",
{'name': name, 'type': method_type, 'obj': obj}) {'name': name, 'type': method_type, 'obj': obj})
try: try:

1
nova/i18n.py
View File

@@ -33,7 +33,6 @@ _ = _translators.primary
# name like '_'. The "L" is for "log" and the other letter comes from # name like '_'. The "L" is for "log" and the other letter comes from
# the level. # the level.
_LI = _translators.log_info _LI = _translators.log_info
_LW = _translators.log_warning
def translate(value, user_locale): def translate(value, user_locale):

11
nova/policy.py
View File

@@ -24,7 +24,6 @@ from oslo_utils import excutils
from nova import exception from nova import exception
from nova.i18n import _LW
from nova import policies from nova import policies
@@ -115,10 +114,12 @@ def _warning_for_deprecated_user_based_rules(rules):
if resource in rule[0]]: if resource in rule[0]]:
continue continue
if 'user_id' in KEY_EXPR.findall(rule[1]): if 'user_id' in KEY_EXPR.findall(rule[1]):
LOG.warning(_LW("The user_id attribute isn't supported in the " LOG.warning(
"rule '%s'. All the user_id based policy " "The user_id attribute isn't supported in the rule '%s'. "
"enforcement will be removed in the " "All the user_id based policy enforcement will be removed in "
"future."), rule[0]) "the future.",
rule[0]
)
def set_rules(rules, overwrite=True, use_conf=False): def set_rules(rules, overwrite=True, use_conf=False):

4
nova/service.py
View File

@@ -34,7 +34,7 @@ import nova.conf
from nova import context from nova import context
from nova import debugger from nova import debugger
from nova import exception from nova import exception
from nova.i18n import _, _LI, _LW from nova.i18n import _, _LI
from nova import objects from nova import objects
from nova.objects import base as objects_base from nova.objects import base as objects_base
from nova.objects import service as service_obj from nova.objects import service as service_obj
@@ -282,7 +282,7 @@ class Service(service.Service):
try: try:
self.service_ref.destroy() self.service_ref.destroy()
except exception.NotFound: except exception.NotFound:
LOG.warning(_LW('Service killed that has no database entry')) LOG.warning('Service killed that has no database entry')
def stop(self): def stop(self):
"""stop the service and clean up.""" """stop the service and clean up."""

11
nova/servicegroup/api.py
View File

@@ -20,7 +20,6 @@ from oslo_log import log as logging
from oslo_utils import importutils from oslo_utils import importutils
import nova.conf import nova.conf
from nova.i18n import _LW
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -47,11 +46,11 @@ class API(object):
report_interval = CONF.report_interval report_interval = CONF.report_interval
if CONF.service_down_time <= report_interval: if CONF.service_down_time <= report_interval:
new_service_down_time = int(report_interval * 2.5) new_service_down_time = int(report_interval * 2.5)
LOG.warning(_LW("Report interval must be less than service down " LOG.warning("Report interval must be less than service down "
"time. Current config: <service_down_time: " "time. Current config: <service_down_time: "
"%(service_down_time)s, report_interval: " "%(service_down_time)s, report_interval: "
"%(report_interval)s>. Setting service_down_time " "%(report_interval)s>. Setting service_down_time "
"to: %(new_service_down_time)s"), "to: %(new_service_down_time)s",
{'service_down_time': CONF.service_down_time, {'service_down_time': CONF.service_down_time,
'report_interval': report_interval, 'report_interval': report_interval,
'new_service_down_time': new_service_down_time}) 'new_service_down_time': new_service_down_time})

8
nova/servicegroup/drivers/db.py
View File

@@ -20,7 +20,7 @@ import six
import nova.conf import nova.conf
from nova import exception from nova import exception
from nova.i18n import _, _LI, _LW from nova.i18n import _, _LI
from nova.servicegroup import api from nova.servicegroup import api
from nova.servicegroup.drivers import base from nova.servicegroup.drivers import base
@@ -102,8 +102,10 @@ class DbDriver(base.Driver):
# as nova-conductor is restarted, so only log this error once. # as nova-conductor is restarted, so only log this error once.
if not getattr(service, 'model_disconnected', False): if not getattr(service, 'model_disconnected', False):
service.model_disconnected = True service.model_disconnected = True
LOG.warning(_LW('Lost connection to nova-conductor ' LOG.warning(
'for reporting service status.')) 'Lost connection to nova-conductor for reporting service '
'status.'
)
except exception.ServiceNotFound: except exception.ServiceNotFound:
# The service may have been deleted via the API but the actual # The service may have been deleted via the API but the actual
# process is still running. Provide a useful error message rather # process is still running. Provide a useful error message rather

8
nova/servicegroup/drivers/mc.py
View File

@@ -23,7 +23,7 @@ from oslo_utils import timeutils
from nova import cache_utils from nova import cache_utils
import nova.conf import nova.conf
from nova.i18n import _, _LI, _LW from nova.i18n import _, _LI
from nova.servicegroup import api from nova.servicegroup import api
from nova.servicegroup.drivers import base from nova.servicegroup.drivers import base
@@ -108,5 +108,7 @@ class MemcachedDriver(base.Driver):
except Exception: except Exception:
if not getattr(service, 'model_disconnected', False): if not getattr(service, 'model_disconnected', False):
service.model_disconnected = True service.model_disconnected = True
LOG.warning(_LW('Lost connection to memcache server ' LOG.warning(
'for reporting service status.')) 'Lost connection to memcache server for reporting service '
'status.'
)

8
nova/utils.py
View File

@@ -53,7 +53,7 @@ from six.moves import range
from nova import block_device from nova import block_device
import nova.conf import nova.conf
from nova import exception from nova import exception
from nova.i18n import _, _LW from nova.i18n import _
from nova import safe_utils from nova import safe_utils
profiler = importutils.try_import('osprofiler.profiler') profiler = importutils.try_import('osprofiler.profiler')
@@ -372,9 +372,9 @@ def sanitize_hostname(hostname, default_name=None):
def truncate_hostname(name): def truncate_hostname(name):
if len(name) > 63: if len(name) > 63:
LOG.warning(_LW("Hostname %(hostname)s is longer than 63, " LOG.warning("Hostname %(hostname)s is longer than 63, "
"truncate it to %(truncated_name)s"), "truncate it to %(truncated_name)s",
{'hostname': name, 'truncated_name': name[:63]}) {'hostname': name, 'truncated_name': name[:63]})
return name[:63] return name[:63]
if isinstance(hostname, six.text_type): if isinstance(hostname, six.text_type):

25
nova/volume/cinder.py
View File

@@ -42,7 +42,6 @@ from nova import availability_zones as az
import nova.conf import nova.conf
from nova import exception from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LW
from nova import service_auth from nova import service_auth
@@ -581,21 +580,21 @@ class API(object):
attachment_id = attachments.get(instance_uuid, {}).\ attachment_id = attachments.get(instance_uuid, {}).\
get('attachment_id') get('attachment_id')
if not attachment_id: if not attachment_id:
LOG.warning(_LW("attachment_id couldn't be retrieved " LOG.warning("attachment_id couldn't be retrieved "
"for volume %(volume_id)s with " "for volume %(volume_id)s with "
"instance_uuid %(instance_id)s. The " "instance_uuid %(instance_id)s. The "
"volume has the 'multiattach' flag " "volume has the 'multiattach' flag "
"enabled, without the attachment_id " "enabled, without the attachment_id "
"Cinder most probably cannot perform " "Cinder most probably cannot perform "
"the detach."), "the detach.",
{'volume_id': volume_id, {'volume_id': volume_id,
'instance_id': instance_uuid}) 'instance_id': instance_uuid})
else: else:
LOG.warning(_LW("attachment_id couldn't be retrieved for " LOG.warning("attachment_id couldn't be retrieved for "
"volume %(volume_id)s. The volume has the " "volume %(volume_id)s. The volume has the "
"'multiattach' flag enabled, without the " "'multiattach' flag enabled, without the "
"attachment_id Cinder most probably " "attachment_id Cinder most probably "
"cannot perform the detach."), "cannot perform the detach.",
{'volume_id': volume_id}) {'volume_id': volume_id})
client.volumes.detach(volume_id, attachment_id) client.volumes.detach(volume_id, attachment_id)