From 3f54423150bb2b88b960c28fbed1b3b704ce5c11 Mon Sep 17 00:00:00 2001 From: Nitzan Mordechai Date: Wed, 4 Dec 2024 06:49:36 +0000 Subject: [PATCH] rados/valgrind-leaks: add timeout value for stop command increase the timeout before stop command failed. in case of monitor running under valgrind, we sometimes failed beacuse of timeout. Fixes: https://tracker.ceph.com/issues/63501 Signed-off-by: Nitzan Mordechai (cherry picked from commit 5668807051302e6080f637d92e0f25ef055e42a3) --- qa/suites/rados/valgrind-leaks/1-start.yaml | 1 + qa/tasks/ceph.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/qa/suites/rados/valgrind-leaks/1-start.yaml b/qa/suites/rados/valgrind-leaks/1-start.yaml index cc8c8e53766..bfc72596cd3 100644 --- a/qa/suites/rados/valgrind-leaks/1-start.yaml +++ b/qa/suites/rados/valgrind-leaks/1-start.yaml @@ -25,6 +25,7 @@ overrides: valgrind: mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes] osd: [--tool=memcheck] + stop-daemons-timeout: 1200 roles: - [mon.a, mon.b, mon.c, mgr.x, mgr.y, osd.0, osd.1, osd.2, client.0] tasks: diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index ae198effa23..1298aa52182 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -1467,7 +1467,8 @@ def run_daemon(ctx, config, type_): try: yield finally: - teuthology.stop_daemons_of_type(ctx, type_, cluster_name) + timeout = config.get('stop-daemons-timeout', 300) + teuthology.stop_daemons_of_type(ctx, type_, cluster_name, timeout=timeout) def healthy(ctx, config): -- 2.39.5