From: John Mulligan Date: Mon, 9 Mar 2026 18:57:05 +0000 (-0400) Subject: mgr/cephadm: replace _calc_daemon_deps call in agent.py X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc90caa8f278abc0a205c6e66f9ee04cc4b5298a;p=ceph.git mgr/cephadm: replace _calc_daemon_deps call in agent.py Replace the use of _calc_daemon_deps in agent.py with direct call to the method that _calc_daemon_deps uses. This avoids a bunch of redundant calls just to get the service class (that we already have) and removes a use of a rarely used "helper" function. Signed-off-by: John Mulligan --- diff --git a/src/pybind/mgr/cephadm/agent.py b/src/pybind/mgr/cephadm/agent.py index 50cca83a9eb9..d767f1b24b57 100644 --- a/src/pybind/mgr/cephadm/agent.py +++ b/src/pybind/mgr/cephadm/agent.py @@ -972,7 +972,7 @@ class CephadmAgentHelpers: return down try: spec = self.mgr.spec_store.active_specs.get(CephadmAgent.TYPE, None) - deps = self.mgr._calc_daemon_deps(spec, CephadmAgent.TYPE, agent.daemon_id) + deps = CephadmAgent.sorted_dependencies(self.mgr, spec, CephadmAgent.TYPE) last_deps, last_config = self.mgr.agent_cache.get_agent_last_config_deps(host) if not last_config or last_deps != deps: # if root cert is the dep that changed, we must use ssh to reconfig