From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 23 Sep 2021 23:49:31 +0000 (-0400)
Subject: pybind/mgr/cephadm: always do mds upgrade sequence
X-Git-Tag: v16.2.7~74^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6697ebe2eaac4be3bf7fafa057ae98398aa115ea;p=ceph.git

pybind/mgr/cephadm: always do mds upgrade sequence

Minor versions also require this sequence.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 4affb5c7029f6b83d640aa7b7206d9cf61e75f1d)
---

diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py
index fad632687e2c..c08cd3a22570 100644
--- a/src/pybind/mgr/cephadm/upgrade.py
+++ b/src/pybind/mgr/cephadm/upgrade.py
@@ -356,24 +356,6 @@ class CephadmUpgrade:
         target_major: str,
         need_upgrade: List[DaemonDescription]
     ) -> bool:
-        # are any daemons running a different major version?
-        scale_down = False
-        for name, info in self.mgr.get("mds_metadata").items():
-            version = info.get("ceph_version_short")
-            major_version = None
-            if version:
-                major_version = version.split('.')[0]
-            if not major_version:
-                self.mgr.log.info('Upgrade: mds.%s version is not known, will retry' % name)
-                time.sleep(5)
-                return False
-            if int(major_version) < int(target_major):
-                scale_down = True
-
-        if not scale_down:
-            self.mgr.log.debug('Upgrade: All MDS daemons run same major version')
-            return True
-
         # scale down all filesystems to 1 MDS
         assert self.upgrade_state
         if not self.upgrade_state.fs_original_max_mds: