From ff074ea81bcee35be37115604c03bfd95582c2d5 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 23 Sep 2024 13:02:32 -0400 Subject: [PATCH] Fix bug when setting split count = 1 Would set the OSD as split in Zookeeper, even though it wasn't. --- daemon-common/ceph.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/daemon-common/ceph.py b/daemon-common/ceph.py index 37636d1c..5baa432c 100644 --- a/daemon-common/ceph.py +++ b/daemon-common/ceph.py @@ -1228,16 +1228,14 @@ def osd_worker_add_osd( current_stage = 0 total_stages = 5 if split_count is None: - _split_count = 1 - else: - _split_count = split_count - total_stages = total_stages + 3 * int(_split_count) + split_count = 1 + total_stages = total_stages + 3 * int(split_count) 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( 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, total=total_stages, ) @@ -1278,7 +1276,7 @@ def osd_worker_add_osd( else: ext_db_flag = False - if split_count is not None: + if split_count > 1: split_flag = f"--osds-per-device {split_count}" is_split = True log_info(