peer.py: we can't assume pg query state will match mon pg state

The pg state could easily have changed in the mean time,
for example, from recovery_wait to recovering.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

diff --git a/teuthology/task/peer.py b/teuthology/task/peer.py
index b70692302bf8c02ae7f2211a2a180ab3a8b9f481..73cafdac231cccb9a88478d4da3f155a42a77def 100644 (file)
--- a/teuthology/task/peer.py
+++ b/teuthology/task/peer.py
@@ -23,11 +23,6 @@ def rados(ctx, 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.
@@ -90,7 +85,6 @@ 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 normalize_state(j['state']) == normalize_state(pg['state'])
 
         if pg['state'].count('down'):
             num_down_pgs += 1