]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
teuthology-ls: show pid, last line of output for running jobs
authorSage Weil <sage@newdream.net>
Sat, 14 Jan 2012 06:08:33 +0000 (22:08 -0800)
committerSage Weil <sage@newdream.net>
Mon, 16 Jan 2012 06:52:58 +0000 (22:52 -0800)
teuthology/suite.py

index c9f69d9bdda886d15f112fda248d5f7bff607a6a..2f1c82a6729918e0492178c1dae283d60b98dca1 100644 (file)
@@ -168,7 +168,25 @@ def ls():
                     summary.update(new)
         except IOError, e:
             if e.errno == errno.ENOENT:
-                print "%s (no summary.yaml)" % j
+                print "%s      (no summary.yaml)" % j,
+
+                # pid
+                try:
+                    pidfile = '%s/%s/pid' % (args.archive_dir, j)
+                    if os.path.isfile(pidfile):
+                        pid = open(pidfile, 'r').read()
+                        if os.path.isdir("/proc/%s" % pid):
+                            cmdline = open('/proc/%s/cmdline' % pid, 'r').read()
+                            if cmdline.find(args.archive_dir) >= 0:
+                                print ' (pid %s)' % pid,
+                    # tail
+                    tail = os.popen(
+                        'tail -1 %s/%s/teuthology.log' % (args.archive_dir, j)
+                        ).read().rstrip()
+                    print " (tail '%s')" % tail
+                except IOError, e:
+                    continue
+                print ''
                 continue
             else:
                 raise