From 231f79030baf8af4b9c92aa94b4a93a0809208ae Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 22 Aug 2019 08:59:43 -0700 Subject: [PATCH] qa: stop DaemonWatchdog for each cluster in daemon roles Fixes: https://tracker.ceph.com/issues/41398 Introduced-by: 08b99eef277b00a3ea423cbf085bd114a805813f Signed-off-by: Patrick Donnelly --- qa/tasks/ceph.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index 65383282f891..e66578fc6e63 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -1675,12 +1675,18 @@ def stop(ctx, config): config = {'daemons': config} daemons = ctx.daemons.resolve_role_list(config.get('daemons', None), CEPH_ROLE_TYPES, True) + clusters = set() + for role in daemons: cluster, type_, id_ = teuthology.split_role(role) ctx.daemons.get_daemon(type_, id_, cluster).stop() + clusters.add(cluster) + + + for cluster in clusters: + ctx.ceph[cluster].watchdog.stop() + ctx.ceph[cluster].watchdog.join() - ctx.ceph[config['cluster']].watchdog.stop() - ctx.ceph[config['cluster']].watchdog.join() yield -- 2.47.3