From 1224a512a267003417252e398b297f20c48995b8 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 17 Nov 2023 15:45:55 -0500 Subject: [PATCH] cepahdm: avoid subclass related issues for data_dir Do not have data dir depend on the daemon_name property. This property is overriden by the subclass(es) but we want DaemonIdentities and DaemonSubIdentities to share the same data_dir. Signed-off-by: John Mulligan --- src/cephadm/cephadmlib/daemon_identity.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cephadm/cephadmlib/daemon_identity.py b/src/cephadm/cephadmlib/daemon_identity.py index f13473c2a239..4114cdf1b597 100644 --- a/src/cephadm/cephadmlib/daemon_identity.py +++ b/src/cephadm/cephadmlib/daemon_identity.py @@ -93,7 +93,9 @@ class DaemonIdentity: return self._systemd_name(category='init', extension='service') def data_dir(self, base_data_dir: Union[str, os.PathLike]) -> str: - return str(pathlib.Path(base_data_dir) / self.fsid / self.daemon_name) + # do not use self.daemon_name as that may be overridden in subclasses + dn = f'{self.daemon_type}.{self.daemon_id}' + return str(pathlib.Path(base_data_dir) / self.fsid / dn) @classmethod def from_name(cls, fsid: str, name: str) -> 'DaemonIdentity': -- 2.47.3