]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks/cephfs: fix vstart's LocalDaemon.proc
authorJohn Spray <john.spray@redhat.com>
Tue, 8 Dec 2015 09:53:44 +0000 (09:53 +0000)
committerJohn Spray <john.spray@redhat.com>
Thu, 14 Jan 2016 22:55:29 +0000 (22:55 +0000)
This class is meant to quack like a DaemonState,
so it needs to expose a .proc attribute.  This
was breaking TestDamageTable.

Signed-off-by: John Spray <john.spray@redhat.com>
tasks/cephfs/vstart_runner.py

index 5c03a811e24b6840ba6e51f2e55c7b44379a2745..579e11d6bf2d1c5b03e62a5337fafcd147163dd0 100644 (file)
@@ -238,6 +238,7 @@ class LocalDaemon(object):
         self.daemon_type = daemon_type
         self.daemon_id = daemon_id
         self.controller = LocalRemote()
+        self.proc = None
 
     @property
     def remote(self):
@@ -284,7 +285,7 @@ class LocalDaemon(object):
         if self._get_pid() is not None:
             self.stop()
 
-        self.controller.run([os.path.join(BIN_PREFIX, "./ceph-{0}".format(self.daemon_type)), "-i", self.daemon_id])
+        self.proc = self.controller.run([os.path.join(BIN_PREFIX, "./ceph-{0}".format(self.daemon_type)), "-i", self.daemon_id])
 
 
 def safe_kill(pid):
@@ -359,6 +360,7 @@ class MountDaemon(object):
 class LocalFuseMount(FuseMount):
     def __init__(self, test_dir, client_id):
         super(LocalFuseMount, self).__init__(None, test_dir, client_id, LocalRemote())
+        self._proc = None
 
     @property
     def config_path(self):