]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
add another call to use "ps aux"
authorAlfredo Deza <alfredo.deza@inktank.com>
Wed, 30 Jul 2014 20:27:40 +0000 (16:27 -0400)
committerAlfredo Deza <alfredo.deza@inktank.com>
Mon, 4 Aug 2014 15:19:28 +0000 (11:19 -0400)
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit 4686115c4830939ea6c9d7a27fd89d7cec9d4d5d)

teuthology/task/ceph_deploy.py

index 0a3aa14d7da46ad4e28c3ee1e967c5fbeb0da025..27ae68b5f322204c7490b3ff217bffc364158429 100644 (file)
@@ -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...')