From fd6dda086de4d23c5964d3f8b58193149c8c0585 Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Thu, 4 Jan 2018 18:06:44 -0800 Subject: [PATCH] use retry instead of bash while loop which can block indefinitly Signed-off-by: Vasu Kulkarni --- .../d-require-luminous/at-mkfs-balancer-crush-compat.yaml | 6 +++++- .../thrash/d-require-luminous/at-mkfs-balancer-upmap.yaml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-crush-compat.yaml b/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-crush-compat.yaml index 9eb7143de1691..b3fc164f5af98 100644 --- a/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-crush-compat.yaml +++ b/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-crush-compat.yaml @@ -4,8 +4,12 @@ overrides: mgr: debug osd: 20 tasks: +- exec: + retry: 20 + sleep_for_retry: 10 + mon.a: + - ceph balancer status - exec: mon.a: - - while ! ceph balancer status ; do sleep 1 ; done - ceph balancer mode crush-compat - ceph balancer on diff --git a/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-upmap.yaml b/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-upmap.yaml index a1e0afea0650a..429a6ddd6e905 100644 --- a/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-upmap.yaml +++ b/qa/suites/rados/thrash/d-require-luminous/at-mkfs-balancer-upmap.yaml @@ -4,8 +4,12 @@ overrides: mgr: debug osd: 20 tasks: +- exec: + retry: 20 + sleep_for_retry: 10 + mon.a: + - ceph balancer status - exec: mon.a: - - while ! ceph balancer status ; do sleep 1 ; done - ceph balancer mode upmap - ceph balancer on -- 2.39.5