]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: if we had no record of deps, and deps are [], do not reconfig 33733/head
authorSage Weil <sage@redhat.com>
Wed, 4 Mar 2020 23:17:08 +0000 (17:17 -0600)
committerSage Weil <sage@redhat.com>
Wed, 4 Mar 2020 23:17:08 +0000 (17:17 -0600)
None != []

This avoids a reconfig of every daemon on upgrade, among other things.

Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py

index 1c6ed178cae9831adf560b92e1487f1264731be8..a00bc8ebc510f65fe37d1f4793a938424e6e9899 100644 (file)
@@ -2203,6 +2203,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             deps = self._calc_daemon_deps(dd.daemon_type, dd.daemon_id)
             last_deps, last_config = self.cache.get_daemon_last_config_deps(
                 dd.hostname, dd.name())
+            if last_deps is None:
+                last_deps = []
             if last_deps != deps:
                 self.log.debug('%s deps %s -> %s' % (dd.name(), last_deps,
                                                      deps))