From: Sage Weil <sage@inktank.com>
Date: Tue, 29 Jan 2013 22:04:09 +0000 (-0800)
Subject: peer: fix filtering out of scrub from pg state
X-Git-Tag: 1.1.0~2352
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=19f427319000d7bcf02c07fa018143b911305a30;p=teuthology.git

peer: fix filtering out of scrub from pg state
---

diff --git a/teuthology/task/peer.py b/teuthology/task/peer.py
index 7a36c85530..0d1cf2ee20 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