From: Sage Weil Date: Tue, 23 Mar 2021 01:57:45 +0000 (-0400) Subject: Merge PR #39435 into master X-Git-Tag: v17.1.0~2516 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94e152fb8dcd324d0c9cbe7d008da67475d8f007;p=ceph.git Merge PR #39435 into master * refs/pull/39435/head: mgr/cephadm: redeploy daemons deployed using old image during upgrade mgr/cephadm: add container digests of mgr that deployed daemon to unit.meta Reviewed-by: Sage Weil Reviewed-by: Sebastian Wagner --- 94e152fb8dcd324d0c9cbe7d008da67475d8f007 diff --cc src/pybind/mgr/cephadm/upgrade.py index 820b05396248,92067a48ec68..d3781ac38f3e --- a/src/pybind/mgr/cephadm/upgrade.py +++ b/src/pybind/mgr/cephadm/upgrade.py @@@ -458,10 -449,10 +458,10 @@@ class CephadmUpgrade daemons = [d for d in self.mgr.cache.get_daemons() if d.daemon_type in CEPH_UPGRADE_ORDER] done = 0 for daemon_type in CEPH_UPGRADE_ORDER: - logger.info('Upgrade: Checking %s daemons' % daemon_type) + logger.debug('Upgrade: Checking %s daemons' % daemon_type) need_upgrade_self = False - need_upgrade = [] + need_upgrade: List[Tuple[DaemonDescription, bool]] = [] for d in daemons: if d.daemon_type != daemon_type: continue