From: Sage Weil <sage@newdream.net>
Date: Tue, 28 Feb 2012 17:50:29 +0000 (-0800)
Subject: peer: ignore +scrubbing portion of pg state
X-Git-Tag: 1.1.0~2609^2~12
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=999e21928cc440340625301a754e1c658f477422;p=teuthology.git

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 096c285a01..78971daf0f 100644
--- 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