x/terracotta
Code Issues Proposed changes

Updated log_host_overload to return whether the host is overloaded

Browse Source
This commit is contained in:
Anton Beloglazov 2012-10-17 16:52:56 +11:00
parent 3cf767281e
commit cb2b7929b8
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neat/locals/collector.py
View File

@ -257,6 +257,7 @@ def execute(config, state):
append_data_remotely(state['db'], cpu_mhz)
if log.isEnabledFor(logging.DEBUG):
log.debug('Collected new data: %s', str(cpu_mhz))
# TODO: save the previous overload state and only log if it's changed
log_host_overload(state['db'],
config['host_cpu_overload_threshold'],
state['hostname'],
@ -580,7 +581,10 @@ def log_host_overload(db, overload_threshold,
:param vms_mhz: A list of CPU utilization of VMs in MHz.
:type vms_mhz: list(int)
:return: Whether the host is overloaded.
:rtype: bool
"""
db.insert_host_overload(
hostname,
overload_threshold * host_mhz < sum(vms_mhz))
overload = overload_threshold * host_mhz < sum(vms_mhz)
db.insert_host_overload(hostname, overload)
return overload

8
tests/locals/test_collector.py
View File

@ -460,10 +460,10 @@ class Collector(TestCase):
db = db_utils.init_db('sqlite:///:memory:')
with MockTransaction:
expect(db).insert_host_overload('host', True).once()
collector.log_host_overload(db, 0.9, 'host', 3000,
[1000, 1000, 800])
assert collector.log_host_overload(db, 0.9, 'host', 3000,
[1000, 1000, 800])
with MockTransaction:
expect(db).insert_host_overload('host', False).once()
collector.log_host_overload(db, 0.9, 'host', 3000,
[1000, 1000, 600])
assert not collector.log_host_overload(db, 0.9, 'host', 3000,
[1000, 1000, 600])