Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Increase timeout waiting for the machine to delete #10789

Merged
merged 4 commits into from
Nov 14, 2024
Merged

Increase timeout waiting for the machine to delete #10789

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6f1d61
Increase timeout waiting for the machine to delete
Oct 30, 2024
1263def
Get the node name from the machine and wait for node to be ready in c…
Nov 7, 2024
522ec79
Add 'wait' param to the function 'delete_machine', move the machine d…
Nov 10, 2024
5ce674a
Add option to ignore CommandFailed Exception in the function 'wait_fo…
Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ocs_ci/ocs/machine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,14 @@ def get_machines(machine_type=constants.WORKER_MACHINE):
return machines


def delete_machine(machine_name):
def delete_machine(machine_name, wait=True, timeout=600):
"""
Deletes a machine

Args:
machine_name (str): Name of the machine you want to delete
wait (bool): Wait for the machine to be deleted
timeout (int): Time to wait for the machine to be deleted

Raises:
CommandFailed: In case yaml_file and resource_name wasn't provided
Expand All @@ -107,7 +109,7 @@ def delete_machine(machine_name):
kind="machine", namespace=constants.OPENSHIFT_MACHINE_API_NAMESPACE
)
log.info(f"Deleting machine {machine_name}")
machine_obj.delete(resource_name=machine_name)
machine_obj.delete(resource_name=machine_name, wait=wait, timeout=timeout)


def get_machine_type(machine_name):
Expand Down Expand Up @@ -167,7 +169,7 @@ def delete_machine_and_check_state_of_new_spinned_machine(machine_name):
machine_type = get_machine_type(machine_name)
machine_list = get_machines(machine_type=machine_type)
initial_machine_names = [machine.name for machine in machine_list]
delete_machine(machine_name)
delete_machine(machine_name, wait=False)
new_machine_list = get_machines(machine_type=machine_type)
new_machine = [
machine
Expand All @@ -181,7 +183,7 @@ def delete_machine_and_check_state_of_new_spinned_machine(machine_name):
condition=constants.STATUS_RUNNING,
resource_name=new_machine_name,
column="PHASE",
timeout=600,
timeout=900,
sleep=30,
)
log.info(f"{new_machine_name} is in {constants.STATUS_RUNNING} state")
Expand Down
23 changes: 19 additions & 4 deletions ocs_ci/ocs/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,10 +931,18 @@ def delete_and_create_osd_node_ipi(osd_node_name):
new_machine_name = machine.delete_machine_and_check_state_of_new_spinned_machine(
machine_name
)
machineset_name = machine.get_machineset_from_machine_name(new_machine_name)
log.info("Waiting for new worker node to be in ready state")
machine.wait_for_new_node_to_be_ready(machineset_name)
new_node_name = get_node_from_machine_name(new_machine_name)
if config.ENV_DATA.get("worker_replicas") == 0:
new_node_name = get_node_from_machine_name(new_machine_name)
log.info("Waiting for new worker node to be in ready state")
wait_for_nodes_status(
[new_node_name], constants.STATUS_READY, timeout=600, sleep=20
)
else:
machineset_name = machine.get_machineset_from_machine_name(new_machine_name)
log.info("Waiting for new worker node to be in ready state")
machine.wait_for_new_node_to_be_ready(machineset_name)
new_node_name = get_node_from_machine_name(new_machine_name)

if not is_node_labeled(new_node_name):
log.info("Adding ocs label to newly created worker node")
node_obj = ocp.OCP(kind="node")
Expand All @@ -943,6 +951,13 @@ def delete_and_create_osd_node_ipi(osd_node_name):
)
log.info(f"Successfully labeled {new_node_name} with OCS storage label")

log.info(f"Wait for the old machine {machine_name} to be deleted")
if config.ENV_DATA.get("worker_replicas") == 0:
timeout = 1200
else:
timeout = 420
ocp_obj = OCP(kind="machine", namespace=constants.OPENSHIFT_MACHINE_API_NAMESPACE)
ocp_obj.wait_for_delete(resource_name=machine_name, timeout=timeout, sleep=30)
return new_node_name


Expand Down
Loading