From 5adef5f7663e25dc946a9a44d5a1ac33e8452ccf Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 9 Apr 2021 16:22:49 -0400 Subject: [PATCH] mgr/orchestrator: report osds as osd.unmanaged as appropriate If there is no osdspec_affinity or service_name (from unit.meta), then report as 'osd.unmanaged'. Signed-off-by: Sage Weil --- src/pybind/mgr/orchestrator/_interface.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py index b27387ef8c2..04e19027ee4 100644 --- a/src/pybind/mgr/orchestrator/_interface.py +++ b/src/pybind/mgr/orchestrator/_interface.py @@ -873,8 +873,6 @@ class DaemonDescription(object): def service_id(self) -> str: assert self.daemon_id is not None assert self.daemon_type is not None - if self.daemon_type == 'osd' and self.osdspec_affinity: - return self.osdspec_affinity if self._service_name: if '.' in self._service_name: @@ -882,6 +880,11 @@ class DaemonDescription(object): else: return '' + if self.daemon_type == 'osd': + if self.osdspec_affinity and self.osdspec_affinity != 'None': + return self.osdspec_affinity + return 'unmanaged' + def _match() -> str: assert self.daemon_id is not None err = OrchestratorError("DaemonDescription: Cannot calculate service_id: " -- 2.39.5