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

Fix bugs and skip safe_to_destroy on force

This commit is contained in:
Joshua Boniface 2023-11-03 02:29:50 -04:00
parent 64e37ae963
commit 20497cf89d
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
node-daemon/pvcnoded/objects/CephInstance.py
View File

@ -562,10 +562,9 @@ class CephOSDInstance(object):
) )
# Try to determine if any other OSDs shared a block device with this OSD # Try to determine if any other OSDs shared a block device with this OSD
_, osd_list = get_list_osd(zkhandler, None)
all_osds_on_block = [ all_osds_on_block = [
o o for o in osd_list if o["node"] == node and o["device"] == osd_block
for o in get_list_osd(zkhandler, None)
if o["node"] == node and o["device"] == osd_block
] ]
# Remove each OSD on the block device # Remove each OSD on the block device
@ -596,7 +595,7 @@ class CephOSDInstance(object):
f"blockdev --getsize64 {all_osds_on_block[0]['db_device']}" f"blockdev --getsize64 {all_osds_on_block[0]['db_device']}"
) )
osd_db_ratio = None osd_db_ratio = None
osd_db_size = f"{osd_db_size}B" osd_db_size = f"{osd_db_size_bytes}B"
else: else:
osd_db_ratio = None osd_db_ratio = None
osd_db_size = None osd_db_size = None
@ -789,6 +788,7 @@ class CephOSDInstance(object):
raise Exception raise Exception
# 2. Wait for the OSD to be safe to remove (but don't wait for rebalancing to complete) # 2. Wait for the OSD to be safe to remove (but don't wait for rebalancing to complete)
if not force_flag:
logger.out(f"Waiting for OSD {osd_id} to be safe to remove", state="i") logger.out(f"Waiting for OSD {osd_id} to be safe to remove", state="i")
while True: while True:
retcode, stdout, stderr = common.run_os_command( retcode, stdout, stderr = common.run_os_command(
@ -797,7 +797,7 @@ class CephOSDInstance(object):
if int(retcode) in [0, 11]: if int(retcode) in [0, 11]:
break break
else: else:
time.sleep(5) time.sleep(1)
# 3. Stop the OSD process and wait for it to be terminated # 3. Stop the OSD process and wait for it to be terminated
logger.out("Stopping OSD {}".format(osd_id), state="i") logger.out("Stopping OSD {}".format(osd_id), state="i")
@ -812,7 +812,7 @@ class CephOSDInstance(object):
logger.out("Ignoring error due to force flag", state="i") logger.out("Ignoring error due to force flag", state="i")
else: else:
raise Exception raise Exception
time.sleep(2) time.sleep(5)
if not skip_zap_flag: if not skip_zap_flag:
# 4. Determine the block devices # 4. Determine the block devices
@ -843,7 +843,7 @@ class CephOSDInstance(object):
raise Exception raise Exception
# 5. Purge the OSD from Ceph # 5. Purge the OSD from Ceph
logger.out("Purging OSD {osd_id}", state="i") logger.out(f"Purging OSD {osd_id}", state="i")
if force_flag: if force_flag:
force_arg = "--force" force_arg = "--force"
else: else: