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

Merge "update noisy_neighbor strategy"

Browse Source
This commit is contained in:
Zuul
2019-08-12 02:07:04 +00:00
committed by Gerrit Code Review
parent 4e4cfc959b 60ef877626
commit 335e430f2a
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/noisy_neighbor.py
View File

@@ -229,9 +229,9 @@ class NoisyNeighbor(base.NoisyNeighborBaseStrategy):
dest_servers = [] dest_servers = []
for host in hosts: for host in hosts:
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 and disk_available >= if (cores_available >= required_cores and disk_available >=
required_disk and mem_available >= required_memory): required_disk and mem_available >= required_memory):
dest_servers.append(host) dest_servers.append(host)

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

@@ -1,9 +1,9 @@
<ModelRoot> <ModelRoot>
<ComputeNode uuid="Node_0" status="enabled" state="up" id="0" hostname="hostname_0" vcpus="50" disk="250" disk_capacity="250" memory="132"> <ComputeNode uuid="Node_0" status="enabled" state="up" id="0" hostname="hostname_0" vcpus="50" 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" name="" uuid="73b09e16-35b7-4922-804e-e8f5d9b740fc" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}, "watcher-priority": "8"}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/> <Instance watcher_exclude="False" state="active" name="" uuid="73b09e16-35b7-4922-804e-e8f5d9b740fc" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}, "watcher-priority": "8"}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
<Instance watcher_exclude="False" state="active" name="" uuid="cae81432-1631-4d4e-b29c-6f3acdcde906" vcpus="15" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}, "watcher-priority": "4"}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/> <Instance watcher_exclude="False" state="active" name="" uuid="cae81432-1631-4d4e-b29c-6f3acdcde906" vcpus="15" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}, "watcher-priority": "4"}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
</ComputeNode> </ComputeNode>
<ComputeNode uuid="Node_1" status="enabled" state="up" id="1" hostname="hostname_1" vcpus="50" disk="250" disk_capacity="250" memory="132"> <ComputeNode uuid="Node_1" status="enabled" state="up" id="1" hostname="hostname_1" vcpus="50" 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" name="" uuid="INSTANCE_3" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}, "watcher-priority": "1"}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/> <Instance watcher_exclude="False" state="active" name="" uuid="INSTANCE_3" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}, "watcher-priority": "1"}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
<Instance watcher_exclude="False" state="active" name="" uuid="INSTANCE_4" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}, "watcher-priority": "9"}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/> <Instance watcher_exclude="False" state="active" name="" uuid="INSTANCE_4" vcpus="10" disk="20" disk_capacity="20" memory="2" metadata='{"optimize": true,"top": "floor", "nested": {"x": "y"}, "watcher-priority": "9"}' project_id="91FFFE30-78A0-4152-ACD2-8310FF274DC9"/>
</ComputeNode> </ComputeNode>