Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NoMetricValuesForInstance error

Browse Source 
This patch set allows in case of NoMetricValuesForInstance exception
to continue the flow of Workload Stabilization strategy
instead of interrupting.

Closes-Bug: #1640096
Change-Id: I2de22bb97defb9c34e409102d06846275793b80d
This commit is contained in:
Alexander Chadin
2016-11-10 15:51:45 +03:00
parent 21abbb4cd1
commit 5e9a2f6fa6
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
watcher/decision_engine/strategy/strategies/workload_stabilization.py
View File

@@ -27,7 +27,7 @@ from oslo_config import cfg
from oslo_log import log from oslo_log import log
import oslo_utils import oslo_utils
from watcher._i18n import _LI, _ from watcher._i18n import _LI, _LW, _
from watcher.common import exception from watcher.common import exception
from watcher.decision_engine.cluster.history import ceilometer as \ from watcher.decision_engine.cluster.history import ceilometer as \
ceilometer_cluster_history ceilometer_cluster_history
@@ -200,8 +200,12 @@ class WorkloadStabilization(base.WorkloadStabilizationBaseStrategy):
aggregate='min' aggregate='min'
) )
if avg_meter is None: if avg_meter is None:
raise exception.NoMetricValuesForInstance( LOG.warning(
resource_id=instance_uuid, metric_name=meter) _LW("No values returned by %(resource_id)s "
"for %(metric_name)s") % dict(
resource_id=instance_uuid,
metric_name=meter))
avg_meter = 0
if meter == 'cpu_util': if meter == 'cpu_util':
avg_meter /= float(100) avg_meter /= float(100)
instance_load[meter] = avg_meter instance_load[meter] = avg_meter