stackforge/libra
Code Issues Proposed changes

Config setting for build diag timeoute

Browse Source 
Change-Id: Ia1cac035d1fc640394ac0e933a7c3e69ef55081a
This commit is contained in:
Michael Johnson 2014-06-30 23:26:30 +00:00
parent 00ca8ee9a4
commit 6cb22c40cf
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/libra.cfg
View File

@ -91,6 +91,7 @@ rabbit_use_ssl = True
#threads = 8 #threads = 8
#rm_fip_ignore_500 = false #rm_fip_ignore_500 = false
#nova_insecure = false #nova_insecure = false
#build_diag_timeout = 10
# Required options # Required options
az = 1 az = 1

5
libra/mgm/__init__.py
View File

@ -84,6 +84,9 @@ cfg.CONF.register_opts(
cfg.IntOpt('threads', cfg.IntOpt('threads',
default=4, default=4,
help='Number of worker threads to spawn'), help='Number of worker threads to spawn'),
], cfg.IntOpt('build_diag_timeout',
default=10,
help='Timeout in seconds the pool manager will wait for a worker to complete the post-build diagnostic tests.'),
],
group=mgm_group group=mgm_group
) )

5
libra/mgm/controllers/build.py
View File

@ -22,7 +22,6 @@ from libra.openstack.common import log
from libra.mgm.nova import Node, BuildError, NotFound from libra.mgm.nova import Node, BuildError, NotFound
POLL_COUNT = 10 POLL_COUNT = 10
POLL_SLEEP = 60
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -162,11 +161,11 @@ class BuildController(object):
client.submitJob(job) client.submitJob(job)
pollcount = 0 pollcount = 0
# Would like to make these config file settings pollsleepinterval = cfg.CONF['mgm']['build_diag_timeout'] / POLL_COUNT
while not job.complete\ while not job.complete\
and pollcount < POLL_COUNT\ and pollcount < POLL_COUNT\
and not job.disconnect: and not job.disconnect:
sleep(POLL_SLEEP) sleep(pollsleepinterval)
pollcount += 1 pollcount += 1
if job.disconnect: if job.disconnect: