openstack
/
charm-ceph-osd
Code Issues Proposed changes

Merge "Fix: increase timeout for remove-disk"

This commit is contained in:
Zuul 2023-03-27 16:32:21 +00:00 committed by Gerrit Code Review
parent aa2ec8c861 8c7ae6889a
commit 7b0bc3699f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/remove_disk.py
View File

@ -129,7 +129,7 @@ def reweight_osd(osd_id, timeout=300):
], timeout=timeout)
def destroy(osd_id, purge=False, timeout=300):
def destroy(osd_id, purge=False, timeout=600):
"""Destroy or purge an OSD id."""
for _ in range(10):
# We might get here before the OSD is marked as down. As such,

2
unit_tests/test_actions_remove_disk.py
View File

@ -94,7 +94,7 @@ class RemoveDiskActionTests(CharmTestCase):
)
check_call.assert_any_call(
prefix_args + ['osd', 'purge', 'osd.1', '--yes-i-really-mean-it'],
timeout=300
timeout=600
)
check_call.assert_any_call(
prefix_args + ['osd', 'crush', 'reweight', 'osd.1', '0'],