openstack
/
nova
Code Issues Proposed changes

Merge "Do not log a warning about not using compute monitors"

This commit is contained in:
Zuul 2019-04-08 09:36:11 +00:00 committed by Gerrit Code Review
parent a777384697 8795f591d5
commit 6587432640
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/compute/monitors/__init__.py
View File

@ -84,8 +84,10 @@ class MonitorHandler(object):
if namespace + '.' + ext.name in cfg_monitors:
self.type_monitor_loaded[namespace] = ext.name
return True
LOG.warning("Excluding %(namespace)s monitor %(monitor_name)s. "
"Not in the list of enabled monitors "
"(CONF.compute_monitors).",
{'namespace': namespace, 'monitor_name': ext.name})
# Only log something if compute_monitors is not empty.
if CONF.compute_monitors:
LOG.warning("Excluding %(namespace)s monitor %(monitor_name)s. "
"Not in the list of enabled monitors "
"(CONF.compute_monitors).",
{'namespace': namespace, 'monitor_name': ext.name})
return False

6
nova/conf/compute.py
View File

@ -113,10 +113,10 @@ a time.
Possible values:
* An empty list will disable the feature (Default).
* An example value that would enable both the CPU and NUMA memory
bandwidth monitors that use the virt driver variant:
* An example value that would enable the CPU
bandwidth monitor that uses the virt driver variant::
compute_monitors = cpu.virt_driver, numa_mem_bw.virt_driver
compute_monitors = cpu.virt_driver
"""),
cfg.StrOpt('default_ephemeral_format',
help="""

9
nova/tests/unit/compute/monitors/test_monitors.py
View File

@ -51,3 +51,12 @@ class MonitorsTestCase(test.NoDBTestCase):
'mon2')
self.assertTrue(handler.check_enabled_monitor(ext_cpu_mon1))
self.assertFalse(handler.check_enabled_monitor(ext_cpu_mon2))
# Run the check but with no monitors enabled to make sure we don't log.
self.flags(compute_monitors=[])
handler = monitors.MonitorHandler(None)
ext_cpu_mon1 = FakeExt('nova.compute.monitors.cpu.virt_driver:Monitor',
'mon1')
with mock.patch.object(monitors.LOG, 'warning') as mock_warning:
self.assertFalse(handler.check_enabled_monitor(ext_cpu_mon1))
mock_warning.assert_not_called()