From: John Spray <john.spray@redhat.com>
Date: Mon, 23 May 2016 18:52:21 +0000 (+0100)
Subject: tasks/cephfs: find processes correctly
X-Git-Tag: v11.1.1~58^2^2~189^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=66901ccc04077c86dbb713ddb4c1ab6de075f482;p=ceph-ci.git

tasks/cephfs: find processes correctly

Don't mistake the daemon-helper line for the actual
daemon process.

Fixes: http://tracker.ceph.com/issues/15900
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/tasks/cephfs/test_sessionmap.py b/tasks/cephfs/test_sessionmap.py
index 7a7c89573fd..eb46764c11d 100644
--- a/tasks/cephfs/test_sessionmap.py
+++ b/tasks/cephfs/test_sessionmap.py
@@ -36,7 +36,7 @@ class TestSessionMap(CephFSTestCase):
         lines = ps_txt.split("\n")[1:]
 
         for line in lines:
-            if line.find("ceph-mds") != -1:
+            if "ceph-mds" in line and not "daemon-helper" in line:
                 if line.find("-i {0}".format(mds_id)) != -1:
                     log.info("Found ps line for daemon: {0}".format(line))
                     return int(line.split()[0])