From 299eb6aad8755da84ebcd40d7a65a797730e7c64 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 17 Jan 2020 23:01:09 +0000 Subject: [PATCH] qa/tasks/cephadm: start watching initial daemons before bootstrap This lets us see output while bootstrap is happening. (Depends on the teuthology change to use journalctl, see teuthology commit 4fa83040b05b604280789459f095d6f2ad1b0d01.) Signed-off-by: Sage Weil --- qa/tasks/cephadm.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 331458e793b..f62f2cc1d83 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -300,6 +300,24 @@ def ceph_bootstrap(ctx, config): log.debug('Final config:\n' + conf_fp.getvalue()) ctx.ceph[cluster_name].conf = seed_config + # register initial daemons + ctx.daemons.register_daemon( + bootstrap_remote, 'mon', first_mon, + cluster=cluster_name, + fsid=fsid, + logger=log.getChild('mon.' + first_mon), + wait=False, + started=True, + ) + ctx.daemons.register_daemon( + bootstrap_remote, 'mgr', first_mgr, + cluster=cluster_name, + fsid=fsid, + logger=log.getChild('mgr.' + first_mgr), + wait=False, + started=True, + ) + # bootstrap log.info('Bootstrapping...') cmd = [ @@ -328,24 +346,6 @@ def ceph_bootstrap(ctx, config): ] bootstrap_remote.run(args=cmd) - # register initial daemons - ctx.daemons.register_daemon( - bootstrap_remote, 'mon', first_mon, - cluster=cluster_name, - fsid=fsid, - logger=log.getChild('mon.' + first_mon), - wait=False, - started=True, - ) - ctx.daemons.register_daemon( - bootstrap_remote, 'mgr', first_mgr, - cluster=cluster_name, - fsid=fsid, - logger=log.getChild('mgr.' + first_mgr), - wait=False, - started=True, - ) - # fetch keys and configs log.info('Fetching config...') ctx.ceph[cluster_name].config_file = teuthology.get_file( -- 2.39.5