From 1565b86dc048e78f6939477a1094f8d6ce3dfce6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 15 Jun 2017 22:29:15 -0400 Subject: [PATCH] qa/tasks/ceph.py: tolerate active+clean+something where something is, say, snaptrim. or maybe scrubbing. or whatever. Signed-off-by: Sage Weil --- qa/tasks/ceph.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index 181429b0716..72a0cc2e9ab 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -1037,11 +1037,12 @@ def osd_scrub_pgs(ctx, config): all_clean = False for _ in range(0, retries): stats = manager.get_pg_stats() - states = [stat['state'] for stat in stats] - if len(set(states)) == 1 and states[0] == 'active+clean': + bad = [stat['pgid'] for stat in stats if 'active+clean' not in stat['state']] + if not bad: all_clean = True break - log.info("Waiting for all osds to be active and clean.") + log.info( + "Waiting for all osds to be active and clean, waiting on %s" % bad) time.sleep(delays) if not all_clean: log.info("Scrubbing terminated -- not all pgs were active and clean.") -- 2.47.3