Merge pull request #44517 from adk3798/agent-cache

mgr/cephadm: store agent metadata in its own cache

Reviewed-By: Sebastian Wagner <sewagner@redhat.com>

diff --cc src/cephadm/cephadm
Simple merge

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge

diff --cc src/pybind/mgr/cephadm/serve.py
index 7f866d462fbcf5177622b46f2d7071ef0433f0a2,f8ab3ad0787d08f34419037d46f159a9a10452cc..ba2d3c65dd2c9d5a666a13240b50095f3c4be248
--- 1/src/pybind/mgr/cephadm/serve.py
--- 2/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@@ -1136,12 -1121,11 +1136,12 @@@ class CephadmServe
                          '--config-json', '-',
                      ] + daemon_spec.extra_args,
                      stdin=json.dumps(daemon_spec.final_config),
 -                    image=image)
 +                    image=image,
 +                )
  
                  if daemon_spec.daemon_type == 'agent':
-                     self.mgr.cache.agent_timestamp[daemon_spec.host] = datetime_now()
-                     self.mgr.cache.agent_counter[daemon_spec.host] = 1
+                     self.mgr.agent_cache.agent_timestamp[daemon_spec.host] = datetime_now()
+                     self.mgr.agent_cache.agent_counter[daemon_spec.host] = 1
  
                  # refresh daemon state?  (ceph daemon reconfig does not need it)
                  if not reconfig or daemon_spec.daemon_type not in CEPH_TYPES:

diff --cc src/pybind/mgr/cephadm/services/cephadmservice.py
Simple merge