From 32361a798fec0dddedc6772de09ce12e49531240 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 19 Jun 2017 11:57:50 -0400 Subject: [PATCH] qa/tasks/ceph: osd_scrub_pgs: tolerate down osd at initial scrub time Signed-off-by: Sage Weil --- qa/tasks/ceph.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index 62af20537c4..a64d9aae602 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -1052,7 +1052,12 @@ def osd_scrub_pgs(ctx, config): for role in teuthology.cluster_roles_of_type(all_roles, 'osd', cluster_name): log.info("Scrubbing {osd}".format(osd=role)) _, _, id_ = teuthology.split_role(role) - manager.raw_cluster_cmd('osd', 'deep-scrub', id_) + # allow this to fail; in certain cases the OSD might not be up + # at this point. we will catch all pgs below. + try: + manager.raw_cluster_cmd('osd', 'deep-scrub', id_) + except run.CommandFailedError: + pass prev_good = 0 gap_cnt = 0 loop = True -- 2.39.5