From: Sage Weil <sage@redhat.com>
Date: Wed, 4 Mar 2020 23:17:08 +0000 (-0600)
Subject: mgr/cephadm: if we had no record of deps, and deps are [], do not reconfig
X-Git-Tag: v15.1.1~106^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d999822be1f6caec59c30c9473409f9fd5201cf1;p=ceph.git

mgr/cephadm: if we had no record of deps, and deps are [], do not reconfig

None != []

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

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 1c6ed178cae9..a00bc8ebc510 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -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))