RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-11 05:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/cephadm: don't allow upgrade start with less than 2 mgrs

Browse Source 
Fixes: https://tracker.ceph.com/issues/50443

Signed-off-by: Adam King <adking@redhat.com>
This commit is contained in:
Adam King 2021-04-22 15:00:44 -04:00
parent 477b705fe7
commit 06d767ee6d
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pybind/mgr/cephadm/tests/test_upgrade.py
View File

@ -7,23 +7,29 @@ from ceph.deployment.service_spec import PlacementSpec, ServiceSpec
from cephadm import CephadmOrchestrator
from cephadm.upgrade import CephadmUpgrade
from cephadm.serve import CephadmServe
from orchestrator import OrchestratorError
from .fixtures import _run_cephadm, wait, with_host, with_service
@mock.patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm('{}'))
def test_upgrade_start(cephadm_module: CephadmOrchestrator):
with with_host(cephadm_module, 'test'):
assert wait(cephadm_module, cephadm_module.upgrade_start(
'image_id', None)) == 'Initiating upgrade to docker.io/image_id'
with with_host(cephadm_module, 'test2'):
with with_service(cephadm_module, ServiceSpec('mgr', placement=PlacementSpec(count=2))):
assert wait(cephadm_module, cephadm_module.upgrade_start(
'image_id', None)) == 'Initiating upgrade to docker.io/image_id'
assert wait(cephadm_module, cephadm_module.upgrade_status()).target_image == 'docker.io/image_id'
assert wait(cephadm_module, cephadm_module.upgrade_status()
).target_image == 'docker.io/image_id'
assert wait(cephadm_module, cephadm_module.upgrade_pause()) == 'Paused upgrade to docker.io/image_id'
assert wait(cephadm_module, cephadm_module.upgrade_pause()
) == 'Paused upgrade to docker.io/image_id'
assert wait(cephadm_module, cephadm_module.upgrade_resume()
) == 'Resumed upgrade to docker.io/image_id'
assert wait(cephadm_module, cephadm_module.upgrade_resume()
) == 'Resumed upgrade to docker.io/image_id'
assert wait(cephadm_module, cephadm_module.upgrade_stop()) == 'Stopped upgrade to docker.io/image_id'
assert wait(cephadm_module, cephadm_module.upgrade_stop()
) == 'Stopped upgrade to docker.io/image_id'
@mock.patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm('{}'))
@ -114,3 +120,11 @@ def test_upgrade_state_null(cephadm_module: CephadmOrchestrator):
cephadm_module.set_store('upgrade_state', 'null')
CephadmUpgrade(cephadm_module)
assert CephadmUpgrade(cephadm_module).upgrade_state is None
@mock.patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm('{}'))
def test_not_enough_mgrs(cephadm_module: CephadmOrchestrator):
with with_host(cephadm_module, 'host1'):
with with_service(cephadm_module, ServiceSpec('mgr', placement=PlacementSpec(count=1)), CephadmOrchestrator.apply_mgr, ''):
with pytest.raises(OrchestratorError):
wait(cephadm_module, cephadm_module.upgrade_start('image_id', None))

9
src/pybind/mgr/cephadm/upgrade.py
View File

@ -8,7 +8,7 @@ import orchestrator
from cephadm.serve import CephadmServe
from cephadm.services.cephadmservice import CephadmDaemonDeploySpec
from cephadm.utils import ceph_release_to_major, name_to_config_section, CEPH_UPGRADE_ORDER, MONITORING_STACK_TYPES
from orchestrator import OrchestratorError, DaemonDescription, daemon_type_to_service
from orchestrator import OrchestratorError, DaemonDescription, DaemonDescriptionStatus, daemon_type_to_service
if TYPE_CHECKING:
from .module import CephadmOrchestrator
@ -199,6 +199,13 @@ class CephadmUpgrade:
self._save_upgrade_state()
return 'Resumed upgrade to %s' % self.target_image
return 'Upgrade to %s in progress' % self.target_image
running_mgr_count = len([daemon for daemon in self.mgr.cache.get_daemons_by_type(
'mgr') if daemon.status == DaemonDescriptionStatus.running])
if running_mgr_count < 2:
raise OrchestratorError('Need at least 2 running mgr daemons for upgrade')
self.mgr.log.info('Upgrade: Started with target %s' % target_name)
self.upgrade_state = UpgradeState(
target_name=target_name,