From: Sebastian Wagner Date: Mon, 8 Feb 2021 16:32:04 +0000 (+0100) Subject: Merge pull request #39153 from mgfritch/cephadm-flake8 X-Git-Tag: v17.1.0~3027 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4d3d17b23fcf6d8808a96b992f56924f495b174;p=ceph.git Merge pull request #39153 from mgfritch/cephadm-flake8 mgr/cephadm: introduce flake8 Reviewed-by: Sebastian Wagner --- d4d3d17b23fcf6d8808a96b992f56924f495b174 diff --cc src/pybind/mgr/cephadm/services/cephadmservice.py index 0ca15a1c78c7,a72a0e7d9086..95fc14f479d8 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@@ -254,17 -242,11 +252,16 @@@ class CephadmService(metaclass=ABCMeta) def plural(count: int) -> str: return 'daemon' if count == 1 else 'daemons' - daemon_count = "only" if number_of_running_daemons == 1 else number_of_running_daemons left_count = "no" if num_daemons_left == 0 else num_daemons_left - out = (f'WARNING: Stopping {len(daemon_ids)} out of {number_of_running_daemons} daemons in {service} service. ' - f'Service will not be operational with {left_count} {plural(num_daemons_left)} left. ' - f'At least {low_limit} {plural(low_limit)} must be running to guarantee service. ') + if alert: + out = (f'ALERT: Cannot stop {names} in {service} service. ' + f'Not enough remaining {service} daemons. ' + f'Please deploy at least {low_limit + 1} {service} daemons before stopping {names}. ') + else: + out = (f'WARNING: Stopping {len(daemon_ids)} out of {number_of_running_daemons} daemons in {service} service. ' + f'Service will not be operational with {left_count} {plural(num_daemons_left)} left. ' + f'At least {low_limit} {plural(low_limit)} must be running to guarantee service. ') return True, out def pre_remove(self, daemon: DaemonDescription) -> None: