From 6697ebe2eaac4be3bf7fafa057ae98398aa115ea Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 23 Sep 2021 19:49:31 -0400 Subject: [PATCH] pybind/mgr/cephadm: always do mds upgrade sequence Minor versions also require this sequence. Signed-off-by: Patrick Donnelly (cherry picked from commit 4affb5c7029f6b83d640aa7b7206d9cf61e75f1d) --- src/pybind/mgr/cephadm/upgrade.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py index fad632687e2..c08cd3a2257 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: -- 2.47.3