From 55a04930e37224f7aafb9df10f5268d9441b4845 Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 8 Dec 2015 09:53:44 +0000 Subject: [PATCH] tasks/cephfs: fix vstart's LocalDaemon.proc 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 --- tasks/cephfs/vstart_runner.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tasks/cephfs/vstart_runner.py b/tasks/cephfs/vstart_runner.py index 5c03a811e24..579e11d6bf2 100644 --- a/tasks/cephfs/vstart_runner.py +++ b/tasks/cephfs/vstart_runner.py @@ -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): -- 2.39.5