From dcaf514bbf1ac19c0ea9f5bfa724bca76ff2d126 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 25 Jan 2021 16:46:43 -0600 Subject: [PATCH] mgr/cephadm: only save version portion of version string We don't want to 'ceph version ' prefix or sha1 suffix. This matches us up with 'orch upgrade start' Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/tests/test_upgrade.py | 2 +- src/pybind/mgr/cephadm/upgrade.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/cephadm/tests/test_upgrade.py b/src/pybind/mgr/cephadm/tests/test_upgrade.py index caf47aef97e..38152534098 100644 --- a/src/pybind/mgr/cephadm/tests/test_upgrade.py +++ b/src/pybind/mgr/cephadm/tests/test_upgrade.py @@ -57,7 +57,7 @@ def test_upgrade_run(use_repo_digest, cephadm_module: CephadmOrchestrator): def _versions_mock(cmd): return json.dumps({ 'mgr': { - 'myversion': 1 + 'ceph version 1.2.3 (asdf) blah': 1 } }) diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py index d3f4f165677..181b0ff23e7 100644 --- a/src/pybind/mgr/cephadm/upgrade.py +++ b/src/pybind/mgr/cephadm/upgrade.py @@ -295,7 +295,8 @@ class CephadmUpgrade: }) return self.upgrade_state.target_id = target_id - self.upgrade_state.target_version = target_version + # extract the version portion of 'ceph version {version} ({sha1})' + self.upgrade_state.target_version = target_version.split(' ')[2] self.upgrade_state.repo_digest = repo_digest self._save_upgrade_state() target_image = self.target_image @@ -418,10 +419,11 @@ class CephadmUpgrade: }) j = json.loads(out_ver) for version, count in j.get(daemon_type, {}).items(): - if version != target_version: + short_version = version.split(' ')[2] + if short_version != target_version: logger.warning( 'Upgrade: %d %s daemon(s) are %s != target %s' % - (count, daemon_type, version, target_version)) + (count, daemon_type, short_version, target_version)) # push down configs if image_settings.get(daemon_type) != target_image: -- 2.39.5