Merge "Add time statistics for master node bootstrap process"
This commit is contained in:
commit
3a297c8474
|
@ -555,19 +555,20 @@ class EnvironmentModel(object):
|
||||||
def wait_bootstrap(self):
|
def wait_bootstrap(self):
|
||||||
logger.info("Waiting while bootstrapping is in progress")
|
logger.info("Waiting while bootstrapping is in progress")
|
||||||
log_path = "/var/log/puppet/bootstrap_admin_node.log"
|
log_path = "/var/log/puppet/bootstrap_admin_node.log"
|
||||||
logger.info("Puppet timeout set in {0}".format(
|
logger.info("Running bootstrap (timeout: {0})".format(
|
||||||
float(settings.PUPPET_TIMEOUT)))
|
float(settings.ADMIN_NODE_BOOTSTRAP_TIMEOUT)))
|
||||||
with self.d_env.get_admin_remote() as admin_remote:
|
with TimeStat("admin_node_bootsrap_time", is_uniq=True):
|
||||||
wait(
|
wait(
|
||||||
lambda: not
|
lambda: self.ssh_manager.execute(
|
||||||
admin_remote.execute(
|
ip=self.ssh_manager.admin_ip,
|
||||||
"grep 'Fuel node deployment' '{:s}'".format(log_path)
|
cmd="grep 'Fuel node deployment' '{:s}'".format(log_path)
|
||||||
)['exit_code'],
|
)['exit_code'] == 0,
|
||||||
timeout=(float(settings.PUPPET_TIMEOUT))
|
timeout=(float(settings.ADMIN_NODE_BOOTSTRAP_TIMEOUT))
|
||||||
)
|
)
|
||||||
result = admin_remote.execute(
|
result = self.ssh_manager.execute(
|
||||||
"grep 'Fuel node deployment "
|
ip=self.ssh_manager.admin_ip,
|
||||||
"complete' '{:s}'".format(log_path))['exit_code']
|
cmd="grep 'Fuel node deployment "
|
||||||
|
"complete' '{:s}'".format(log_path))['exit_code']
|
||||||
if result != 0:
|
if result != 0:
|
||||||
raise Exception('Fuel node deployment failed.')
|
raise Exception('Fuel node deployment failed.')
|
||||||
self.bootstrap_image_check()
|
self.bootstrap_image_check()
|
||||||
|
|
|
@ -82,7 +82,9 @@ WAIT_FOR_PROVISIONING_TIMEOUT = int(os.environ.get(
|
||||||
"WAIT_FOR_PROVISIONING_TIMEOUT", 1200))
|
"WAIT_FOR_PROVISIONING_TIMEOUT", 1200))
|
||||||
|
|
||||||
ADMIN_NODE_SETUP_TIMEOUT = os.environ.get("ADMIN_NODE_SETUP_TIMEOUT", 30)
|
ADMIN_NODE_SETUP_TIMEOUT = os.environ.get("ADMIN_NODE_SETUP_TIMEOUT", 30)
|
||||||
PUPPET_TIMEOUT = os.environ.get("PUPPET_TIMEOUT", 6000)
|
ADMIN_NODE_BOOTSTRAP_TIMEOUT = os.environ.get(
|
||||||
|
"ADMIN_NODE_BOOTSTRAP_TIMEOUT", 3600)
|
||||||
|
|
||||||
|
|
||||||
HARDWARE = {
|
HARDWARE = {
|
||||||
"admin_node_memory": os.environ.get("ADMIN_NODE_MEMORY", 3072),
|
"admin_node_memory": os.environ.get("ADMIN_NODE_MEMORY", 3072),
|
||||||
|
|
Loading…
Reference in New Issue