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

Merge "Add hardware.cpu_util in workload_stabilization"

Browse Source
This commit is contained in:
Zuul
2019-04-26 02:36:20 +00:00
committed by Gerrit Code Review
parent 2a1c353014 4db39c527d
commit 92c94f61ca
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -271,6 +271,7 @@ class WorkloadStabilization(base.WorkloadStabilizationBaseStrategy):
"for %(metric_name)s", dict( "for %(metric_name)s", dict(
resource_id=instance.uuid, metric_name=meter)) resource_id=instance.uuid, metric_name=meter))
return return
# cpu_util has been deprecated since Stein.
if meter == 'cpu_util': if meter == 'cpu_util':
avg_meter /= float(100) avg_meter /= float(100)
LOG.debug('Load of %(metric)s for %(instance)s is %(value)s', LOG.debug('Load of %(metric)s for %(instance)s is %(value)s',
@@ -324,6 +325,9 @@ class WorkloadStabilization(base.WorkloadStabilizationBaseStrategy):
avg_meter /= oslo_utils.units.Ki avg_meter /= oslo_utils.units.Ki
if meter_name == 'compute.node.cpu.percent': if meter_name == 'compute.node.cpu.percent':
avg_meter /= 100 avg_meter /= 100
# hardware.cpu.util has been deprecated since Stein.
if meter_name == 'hardware.cpu.util':
avg_meter /= 100
LOG.debug('Load of %(metric)s for %(node)s is %(value)s', LOG.debug('Load of %(metric)s for %(node)s is %(value)s',
{'metric': metric, {'metric': metric,
'node': node_id, 'node': node_id,