tests: Allow more VMs to be started in parallel
Check the number of CPUs to determine how many VMs can be started in parallel. Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
parent
d07ca835cb
commit
a6ba5cca45
1 changed files with 18 additions and 13 deletions
|
@ -10,6 +10,7 @@ from __future__ import print_function
|
|||
import curses
|
||||
import fcntl
|
||||
import logging
|
||||
import multiprocessing
|
||||
import os
|
||||
import selectors
|
||||
import subprocess
|
||||
|
@ -213,21 +214,25 @@ def vm_next_step(_vm, scr, test_queue):
|
|||
|
||||
def check_vm_start(scr, sel, test_queue):
|
||||
running = False
|
||||
updated = False
|
||||
for i in range(num_servers):
|
||||
if not vm[i]['proc']:
|
||||
if vm[i]['proc']:
|
||||
running = True
|
||||
continue
|
||||
|
||||
# Either not yet started or already stopped VM
|
||||
if test_queue and vm[i]['cmd'] and num_vm_starting() < 2:
|
||||
max_start = multiprocessing.cpu_count()
|
||||
if max_start > 4:
|
||||
max_start /= 2
|
||||
num_starting = num_vm_starting()
|
||||
if vm[i]['cmd'] and len(test_queue) > num_starting and \
|
||||
num_starting < max_start:
|
||||
scr.move(i + 1, 10)
|
||||
scr.clrtoeol()
|
||||
scr.addstr(i + 1, 10, "starting VM")
|
||||
updated = True
|
||||
start_vm(vm[i], sel)
|
||||
else:
|
||||
continue
|
||||
return True, True
|
||||
|
||||
running = True
|
||||
return running, updated
|
||||
return running, False
|
||||
|
||||
def vm_terminated(_vm, scr, sel, test_queue):
|
||||
updated = False
|
||||
|
|
Loading…
Reference in a new issue