summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nova/compute/monitors/cpu/virt_driver.py2
-rw-r--r--nova/compute/resource_tracker.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/nova/compute/monitors/cpu/virt_driver.py b/nova/compute/monitors/cpu/virt_driver.py
index 604423e2b3..bdc744db1a 100644
--- a/nova/compute/monitors/cpu/virt_driver.py
+++ b/nova/compute/monitors/cpu/virt_driver.py
@@ -62,7 +62,7 @@ class Monitor(base.CPUMonitorBase):
self._data["cpu.idle.time"] = stats["idle"]
self._data["cpu.iowait.time"] = stats["iowait"]
self._data["cpu.frequency"] = stats["frequency"]
- except (NotImplementedError, TypeError, KeyError):
+ except (TypeError, KeyError):
LOG.exception(_LE("Not all properties needed are implemented "
"in the compute driver"))
raise exception.ResourceMonitorError(
diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py
index 29de8c61d9..05b1235041 100644
--- a/nova/compute/resource_tracker.py
+++ b/nova/compute/resource_tracker.py
@@ -524,6 +524,9 @@ class ResourceTracker(object):
for monitor in self.monitors:
try:
monitor.populate_metrics(metrics)
+ except NotImplementedError:
+ LOG.debug("The compute driver doesn't support host "
+ "metrics for %(mon)s", {'mon': monitor})
except Exception as exc:
LOG.warning(_LW("Cannot get the metrics from %(mon)s; "
"error: %(exc)s"),