parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Fix bug when setting split count = 1 

Would set the OSD as split in Zookeeper, even though it wasn't.
This commit is contained in:
Joshua Boniface 2024-09-23 13:02:32 -04:00
parent 41cd34ba4d
commit 0e389ba1f4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daemon-common/ceph.py
View File

@ -1228,16 +1228,16 @@ def osd_worker_add_osd(
current_stage = 0 current_stage = 0
total_stages = 5 total_stages = 5
if split_count is None: if split_count is None:
_split_count = 1 split_count = 1
else: else:
_split_count = split_count split_count = int(split_count)
total_stages = total_stages + 3 * int(_split_count) total_stages = total_stages + 3 * int(split_count)
if ext_db_ratio is not None or ext_db_size is not None: if ext_db_ratio is not None or ext_db_size is not None:
total_stages = total_stages + 3 * int(_split_count) + 1 total_stages = total_stages + 3 * int(split_count) + 1
start( start(
celery, celery,
f"Adding {_split_count} new OSD(s) on device {device} with weight {weight}", f"Adding {split_count} new OSD(s) on device {device} with weight {weight}",
current=current_stage, current=current_stage,
total=total_stages, total=total_stages,
) )
@ -1278,7 +1278,7 @@ def osd_worker_add_osd(
else: else:
ext_db_flag = False ext_db_flag = False
if split_count is not None: if split_count > 1:
split_flag = f"--osds-per-device {split_count}" split_flag = f"--osds-per-device {split_count}"
is_split = True is_split = True
log_info( log_info(