]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Fix MDS wait when get_mds_status returns None 181/head
authorJohn Spray <john.spray@inktank.com>
Fri, 31 Jan 2014 20:45:31 +0000 (20:45 +0000)
committerJohn Spray <john.spray@inktank.com>
Fri, 31 Jan 2014 20:49:13 +0000 (20:49 +0000)
teuthology/task/mds_thrash.py

index c371e50cc90ee18d5ab4208cdc46d0a315aa1ae2..8a58932a66a77d69a1e19e4d2b224db775022c81 100644 (file)
@@ -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