From: John Spray <john.spray@inktank.com>
Date: Fri, 31 Jan 2014 20:45:31 +0000 (+0000)
Subject: Fix MDS wait when get_mds_status returns None
X-Git-Tag: 1.1.0~1681^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aaf9b51c601c0829578dfa3ec47be8c271ec7c86;p=teuthology.git

Fix MDS wait when get_mds_status returns None
---

diff --git a/teuthology/task/mds_thrash.py b/teuthology/task/mds_thrash.py
index c371e50c..8a58932a 100644
--- a/teuthology/task/mds_thrash.py
+++ b/teuthology/task/mds_thrash.py
@@ -274,9 +274,9 @@ def task(ctx, config):
             if isinstance(s, dict):
                 statuses_by_rank[s['rank']] = s
 
-        ready = filter(lambda (_,s): s['state'] == 'up:active'
-                          or s['state'] == 'up:standby'
-                          or s['state'] == 'up:standby-replay',
+        ready = filter(lambda (_, s): s is not None and (s['state'] == 'up:active'
+                                                         or s['state'] == 'up:standby'
+                                                         or s['state'] == 'up:standby-replay'),
                        statuses.items())
         if len(ready) == len(statuses):
             break