Skip to content

Commit ffe8723

Browse files
authored
Merge pull request ceph#65149 from ShwetaBhosale1/fix_issue_72652_max_num_of_osds_to_upgrade_in_single_iteration
mgr/cephadm: Config parameter to set the max number of OSDs to upgrade in single iteration Reviewed-by: Adam King <[email protected]> Reviewed-by: Redouane Kachach <[email protected]>
2 parents 1d750a5 + 621551a commit ffe8723

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/pybind/mgr/cephadm/module.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,12 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
402402
default=10,
403403
desc='max number of osds that will be drained simultaneously when osds are removed'
404404
),
405+
Option(
406+
'max_parallel_osd_upgrades',
407+
type='int',
408+
default=16,
409+
desc='Maximum number of OSD daemons upgraded in parallel.'
410+
),
405411
Option(
406412
'service_discovery_port',
407413
type='int',
@@ -587,6 +593,7 @@ def __init__(self, *args: Any, **kwargs: Any):
587593
self.secure_monitoring_stack = False
588594
self.apply_spec_fails: List[Tuple[str, str]] = []
589595
self.max_osd_draining_count = 10
596+
self.max_parallel_osd_upgrades = 16
590597
self.device_enhanced_scan = False
591598
self.inventory_list_all = False
592599
self.cgroups_split = True

src/pybind/mgr/cephadm/services/cephadmservice.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ def ok_to_stop_osd(
615615
r = HandleCommandResult(*self.mgr.mon_command({
616616
'prefix': "osd ok-to-stop",
617617
'ids': osds,
618-
'max': 16,
618+
'max': self.mgr.max_parallel_osd_upgrades,
619619
}))
620620
j = None
621621
try:

0 commit comments

Comments
 (0)