From 19f427319000d7bcf02c07fa018143b911305a30 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 29 Jan 2013 14:04:09 -0800 Subject: [PATCH] peer: fix filtering out of scrub from pg state --- teuthology/task/peer.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/teuthology/task/peer.py b/teuthology/task/peer.py index 7a36c85530a53..0d1cf2ee20219 100644 --- a/teuthology/task/peer.py +++ b/teuthology/task/peer.py @@ -24,6 +24,11 @@ def rados(remote, cmd): ) return proc.exitstatus +def normalize_state(r): + r = r.replace('+scrubbing', '') + r = r.replace('+deep', '') + return r + def task(ctx, config): """ Test peering. @@ -81,7 +86,7 @@ def task(ctx, config): log.debug("out string %s",out) j = json.loads('\n'.join(out.split('\n')[1:])) log.info("pg is %s, query json is %s", pg, j) - assert j['state'].replace('+scrubbing','') == pg['state'].replace('+scrubbing','') + assert normalize_state(j['state']) == normalize_state(pg['state']) if pg['state'].count('down'): num_down_pgs += 1 -- 2.39.5