]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: agent: clear cached daemon metadata when regathering full data
authorAdam King <adking@redhat.com>
Thu, 27 Oct 2022 21:07:39 +0000 (17:07 -0400)
committerAdam King <adking@redhat.com>
Wed, 30 Nov 2022 17:00:35 +0000 (12:00 -0500)
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>
src/cephadm/cephadm.py

index 4201de3d9cb3134293feb966ae81cabf02a71121..1365f5aa4cb18b2d0b57d2f589cc22c32e711da9 100755 (executable)
@@ -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)