]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Update do_summary()
authorZack Cerza <zack@cerza.org>
Mon, 19 May 2014 22:53:22 +0000 (17:53 -0500)
committerZack Cerza <zack.cerza@inktank.com>
Mon, 25 Aug 2014 17:14:37 +0000 (11:14 -0600)
Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
teuthology/lock.py

index f2dbd0355b81b27d3b070593ee7c62aa6e056c5a..83513fb6cdfffd98e1b059f1064f3c0f5e3b66dd 100644 (file)
@@ -408,13 +408,12 @@ def scan_for_locks(ctx, machines):
 
 def do_summary(ctx):
     lockd = collections.defaultdict(lambda: [0, 0, 'unknown'])
-    for l in list_locks():
-        if ctx.machine_type and l['type'] != ctx.machine_type:
-            continue
-        who = l['locked_by'] if l['locked'] == 1 else '(free)', l['type']
+    for l in list_locks(ctx.machine_type):
+        who = l['locked_by'] if l['locked'] == 1 \
+            else '(free)', l['machine_type']
         lockd[who][0] += 1
-        lockd[who][1] += l['up']         # up is 1 or 0
-        lockd[who][2] = l['type']
+        lockd[who][1] += 1 if l['up'] else 0
+        lockd[who][2] = l['machine_type']
 
     locks = sorted([p for p in lockd.iteritems()
                     ], key=lambda sort: (sort[1][2], sort[1][0]))