peer: ignore +scrubbing portion of pg state

It can cause the mon state and osd states to not match.

diff --git a/teuthology/task/peer.py b/teuthology/task/peer.py
index 096c285a01db5def0165f26bafc9d95df274840e..78971daf0fa1064ad3b73d62e8447b2d1a621dc3 100644 (file)
--- a/teuthology/task/peer.py
+++ b/teuthology/task/peer.py
@@ -79,8 +79,8 @@ def task(ctx, config):
     for pg in pgs:
         out = manager.raw_cluster_cmd('pg', pg['pgid'], 'query')
         j = json.loads('\n'.join(out.split('\n')[1:]))
-        log.info("json is %s" % j)
-        assert j['state'] == pg['state']
+        log.info("pg is %s, query json is %s", pg, j)
+        assert j['state'].replace('+scrubbing','') == pg['state'].replace('+scrubbing','')
 
         if pg['state'].count('down'):
             num_down_pgs += 1