Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dom0/qmemman: Fix distribution memory left because of memory_maximum

Browse Source
This commit is contained in:
Marek Marczykowski 2011-06-07 15:56:55 +02:00
parent 9ed6b94d63
commit 50a910362d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom0/qmemman/qmemman_algo.py
View File

@ -129,6 +129,7 @@ def balance_when_enough_memory(domain_dictionary, xen_free_memory, total_mem_pre
while left_memory > 0 and acceptors_count > 0: while left_memory > 0 and acceptors_count > 0:
print ' left_memory:', left_memory, 'acceptors_count:', acceptors_count print ' left_memory:', left_memory, 'acceptors_count:', acceptors_count
new_left_memory = 0 new_left_memory = 0
new_acceptors_count = acceptors_count
for i in target_memory.keys(): for i in target_memory.keys():
target = target_memory[i] target = target_memory[i]
if target < domain_dictionary[i].memory_maximum: if target < domain_dictionary[i].memory_maximum:
@ -136,11 +137,12 @@ def balance_when_enough_memory(domain_dictionary, xen_free_memory, total_mem_pre
if target+memory_bonus >= domain_dictionary[i].memory_maximum: if target+memory_bonus >= domain_dictionary[i].memory_maximum:
new_left_memory += target+memory_bonus - domain_dictionary[i].memory_maximum new_left_memory += target+memory_bonus - domain_dictionary[i].memory_maximum
target = domain_dictionary[i].memory_maximum target = domain_dictionary[i].memory_maximum
acceptors_count -= 1 new_acceptors_count -= 1
else: else:
target += memory_bonus target += memory_bonus
target_memory[i] = target target_memory[i] = target
left_memory = new_left_memory left_memory = new_left_memory
acceptors_count = new_acceptors_count
# split target_memory dictionary to donors and acceptors # split target_memory dictionary to donors and acceptors
# this is needed to first get memory from donors and only then give it to acceptors # this is needed to first get memory from donors and only then give it to acceptors
donors_rq = list() donors_rq = list()