From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Wed, 30 Jul 2014 20:27:40 +0000 (-0400)
Subject: add another call to use "ps aux"
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc3ae881c4032d1826f67eb96d1a33d7988f63b2;p=teuthology.git

add another call to use "ps aux"

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit 4686115c4830939ea6c9d7a27fd89d7cec9d4d5d)
---

diff --git a/teuthology/task/ceph_deploy.py b/teuthology/task/ceph_deploy.py
index 0a3aa14d7..27ae68b5f 100644
--- a/teuthology/task/ceph_deploy.py
+++ b/teuthology/task/ceph_deploy.py
@@ -348,8 +348,16 @@ def build_ceph_cluster(ctx, config):
                               'sudo', 'service', 'ceph', 'stop' ])
 
         # Are you really not running anymore?
+        # try first with the init tooling
         ctx.cluster.run(args=['sudo', 'status', 'ceph-all', run.Raw('||'),
                               'sudo', 'service',  'status', 'ceph-all'])
+
+        # and now just check for the processes themselves, as if upstart/sysvinit
+        # is lying to us
+        ctx.cluster.run(args=['sudo', 'ps', 'aux', run.Raw('|'),
+                              'grep', '-v', 'grep', run.Raw('|'),
+                              'grep', 'ceph'])
+
         if ctx.archive is not None:
             # archive mon data, too
             log.info('Archiving mon data...')