From fb709c89f1643eb7aa8cc01bcc8c7e64ae2860c3 Mon Sep 17 00:00:00 2001 From: Adam King Date: Fri, 3 Dec 2021 13:52:59 -0500 Subject: [PATCH] mgr/cephadm: allow upgrading multiple daemons at once if not osd, mon, mds These daemons don't need to check ok-to-stop in the upgrade so no reason to break from this loop after a single daemon is added to to_upgrade Signed-off-by: Adam King --- src/pybind/mgr/cephadm/upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py index a075d8bfc5a..5c73a8c6a23 100644 --- a/src/pybind/mgr/cephadm/upgrade.py +++ b/src/pybind/mgr/cephadm/upgrade.py @@ -689,7 +689,7 @@ class CephadmUpgrade: to_upgrade.append(d_entry) # if we don't have a list of others to consider, stop now - if not known_ok_to_stop: + if d.daemon_type in ['osd', 'mds', 'mon'] and not known_ok_to_stop: break num = 1 -- 2.47.3