From: Adam King <adking@redhat.com>
Date: Thu, 27 Oct 2022 21:07:39 +0000 (-0400)
Subject: cephadm: agent: clear cached daemon metadata when regathering full data
X-Git-Tag: v18.1.0~552^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c54055e2bd4d565299ccd0f7cb34c62069e3dfb8;p=ceph.git

cephadm: agent: clear cached daemon metadata when regathering full data

Otherwise we might keep reporting a daemon that isn't
actually present anymore because it's left over in the cache

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 4201de3d9cb3..1365f5aa4cb1 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -4535,6 +4535,7 @@ WantedBy=ceph-{fsid}.target
                 # case for a new daemon in ls or an old daemon no longer appearing.
                 # If that happens we need a full ls
                 logger.info('Change detected in state of daemons. Running full daemon ls')
+                self.cached_ls_values = {}
                 ls = list_daemons(self.ctx)
                 for d in ls:
                     self.cached_ls_values[d['name']] = d
@@ -4566,6 +4567,7 @@ WantedBy=ceph-{fsid}.target
             if need_full_ls:
                 logger.info('Change detected in state of daemons. Running full daemon ls')
                 ls = list_daemons(self.ctx)
+                self.cached_ls_values = {}
                 for d in ls:
                     self.cached_ls_values[d['name']] = d
                 return (ls, True)