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

Avoid dividing zero

Browse Source 
Some flavors may set disk size 0 byte, so disk_capacity may be 0.

Change-Id: I0f2cfd5ce9f64cd94e7b6ded7865384cb2b1e190
Closes-Bug: #1517033
This commit is contained in:
Zhenzan Zhou
2015-11-17 21:18:02 +08:00
parent 8920fe0649
commit a6db530c77
3 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
watcher/decision_engine/strategies/basic_consolidation.py
View File

@@ -233,8 +233,12 @@ class BasicConsolidation(Strategy):
score_cores = (1 - (float(cpu_capacity) - float(total_cores_used)) /
float(cpu_capacity))
score_disk = (1 - (float(disk_capacity) - float(total_disk_used)) /
float(disk_capacity))
# It's possible that disk_capacity is 0, e.g. m1.nano.disk = 0
if disk_capacity == 0:
score_disk = 0
else:
score_disk = (1 - (float(disk_capacity) - float(total_disk_used)) /
float(disk_capacity))
score_memory = (
1 - (float(memory_capacity) - float(total_memory_used)) /