From: Adam King Date: Fri, 3 Dec 2021 18:52:59 +0000 (-0500) Subject: mgr/cephadm: allow upgrading multiple daemons at once if not osd, mon, mds X-Git-Tag: v17.1.0~136^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb709c89f1643eb7aa8cc01bcc8c7e64ae2860c3;p=ceph.git 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 --- diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py index a075d8bfc5ab..5c73a8c6a230 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