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

update outlet_temp_control strategy

Browse Source 
For Compute node, we can use the new property to calculate
resource(VCPU, memory and disk).

Partially Implements: blueprint improve-compute-data-model
Depends-on: I3f9a3279a26f3df444117d9265e74cca57b38d6e
Change-Id: Id113b4c19792946329e9ff448bfe636cc8eca057
This commit is contained in:
licanwei
2019-08-07 11:28:22 +08:00
parent 251ad35c8b
commit 93b40e9262
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
watcher/decision_engine/strategy/strategies/outlet_temp_control.py
View File

@@ -223,9 +223,9 @@ class OutletTempControl(base.ThermalOptimizationBaseStrategy):
host = instance_data['compute_node'] host = instance_data['compute_node']
# available # available
cores_used, mem_used, disk_used = self.calc_used_resource(host) cores_used, mem_used, disk_used = self.calc_used_resource(host)
cores_available = host.vcpus - cores_used cores_available = host.vcpu_capacity - cores_used
disk_available = host.disk - disk_used disk_available = host.disk_gb_capacity - disk_used
mem_available = host.memory - mem_used mem_available = host.memory_mb_capacity - mem_used
if cores_available >= required_cores \ if cores_available >= required_cores \
and disk_available >= required_disk \ and disk_available >= required_disk \
and mem_available >= required_memory: and mem_available >= required_memory:

4
watcher/tests/decision_engine/model/data/scenario_3_with_2_nodes.xml
View File

@@ -1,8 +1,8 @@
<ModelRoot> <ModelRoot>
<ComputeNode uuid="fa69c544-906b-4a6a-a9c6-c1f7a8078c73" status="enabled" state="up" id="0" hostname="hostname_0" vcpus="40" disk="250" disk_capacity="250" memory="132"> <ComputeNode uuid="fa69c544-906b-4a6a-a9c6-c1f7a8078c73" status="enabled" state="up" id="0" hostname="hostname_0" vcpus="40" vcpu_reserved="0" vcpu_ratio="1" disk="250" disk_gb_reserved="0" disk_ratio="1" disk_capacity="250" memory="132" memory_mb_reserved="0" memory_ratio="1">
<Instance watcher_exclude="False" state="active" human_id="" name="" uuid="73b09e16-35b7-4922-804e-e8f5d9b740fc" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/> <Instance watcher_exclude="False" state="active" human_id="" name="" uuid="73b09e16-35b7-4922-804e-e8f5d9b740fc" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
</ComputeNode> </ComputeNode>
<ComputeNode uuid="af69c544-906b-4a6a-a9c6-c1f7a8078c73" status="enabled" state="up" id="1" hostname="hostname_1" vcpus="40" disk="250" disk_capacity="250" memory="132"> <ComputeNode uuid="af69c544-906b-4a6a-a9c6-c1f7a8078c73" status="enabled" state="up" id="1" hostname="hostname_1" vcpus="40" vcpu_reserved="0" vcpu_ratio="1" disk="250" disk_gb_reserved="0" disk_ratio="1" disk_capacity="250" memory="132" memory_mb_reserved="0" memory_ratio="1">
<Instance watcher_exclude="False" state="active" human_id="" name="" uuid="a4cab39b-9828-413a-bf88-f76921bf1517" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/> <Instance watcher_exclude="False" state="active" human_id="" name="" uuid="a4cab39b-9828-413a-bf88-f76921bf1517" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
</ComputeNode> </ComputeNode>
</ModelRoot> </ModelRoot>