From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Thu, 27 Jan 2022 22:34:01 +0000 (-0500)
Subject: Merge pull request #44517 from adk3798/agent-cache
X-Git-Tag: v18.0.0~1485
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b861305ea09124020fb8d0860fe50de2b5fc04f;p=ceph.git

Merge pull request #44517 from adk3798/agent-cache

mgr/cephadm: store agent metadata in its own cache

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

1b861305ea09124020fb8d0860fe50de2b5fc04f
diff --cc src/pybind/mgr/cephadm/serve.py
index 7f866d462fb,f8ab3ad0787..ba2d3c65dd2
--- a/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: