Skip to content

Commit 5668807

Browse files
committed
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 <nmordech@redhat.com>
1 parent 5a2a3a6 commit 5668807

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

qa/suites/rados/valgrind-leaks/1-start.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ overrides:
2525
valgrind:
2626
mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
2727
osd: [--tool=memcheck]
28+
stop-daemons-timeout: 1200
2829
roles:
2930
- [mon.a, mon.b, mon.c, mgr.x, mgr.y, osd.0, osd.1, osd.2, client.0]
3031
tasks:

qa/tasks/ceph.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1514,7 +1514,8 @@ def run_daemon(ctx, config, type_):
15141514
try:
15151515
yield
15161516
finally:
1517-
teuthology.stop_daemons_of_type(ctx, type_, cluster_name)
1517+
timeout = config.get('stop-daemons-timeout', 300)
1518+
teuthology.stop_daemons_of_type(ctx, type_, cluster_name, timeout=timeout)
15181519

15191520

15201521
def healthy(ctx, config):

0 commit comments

Comments
 (0)