From: Sage Weil <sage@redhat.com>
Date: Wed, 22 Jan 2020 22:25:09 +0000 (-0600)
Subject: mgr/cephadm: only need_upgrade_self if image_id doesn't match
X-Git-Tag: v15.1.0~92^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c360205961d07631cc954fcbefef5dfb209493d4;p=ceph.git

mgr/cephadm: only need_upgrade_self if image_id doesn't match

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 870460b05bc9..dca283f55741 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -441,29 +441,32 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
             for d in daemons:
                 if d.service_type != daemon_type:
                     continue
+                if d.container_image_id == target_id:
+                    continue
+
                 if daemon_type == 'mgr' and \
                    d.service_instance == self.get_mgr_id():
                     self.log.info('Upgrade: Need to upgrade myself (mgr.%s)' %
                                   self.get_mgr_id())
                     need_upgrade_self = True
                     continue
-                if d.container_image_id != target_id:
-                    if not self._wait_for_ok_to_stop(d):
-                        return None
-                    self.log.info('Upgrade: Redeploying %s.%s' %
-                                  (d.service_type, d.service_instance))
-                    ret, out, err = self.mon_command({
-                        'prefix': 'config set',
-                        'name': 'container_image',
-                        'value': target_name,
-                        'who': daemon_type + '.' + d.service_instance,
-                    })
-                    return self._service_action([(
-                        d.service_type,
-                        d.service_instance,
-                        d.nodename,
-                        'redeploy'
-                    )])
+
+                if not self._wait_for_ok_to_stop(d):
+                    return None
+                self.log.info('Upgrade: Redeploying %s.%s' %
+                              (d.service_type, d.service_instance))
+                ret, out, err = self.mon_command({
+                    'prefix': 'config set',
+                    'name': 'container_image',
+                    'value': target_name,
+                    'who': daemon_type + '.' + d.service_instance,
+                })
+                return self._service_action([(
+                    d.service_type,
+                    d.service_instance,
+                    d.nodename,
+                    'redeploy'
+                )])
 
             if need_upgrade_self:
                 mgr_map = self.get('mgr_map')