Skip to content

WIP: [Storage] Refactor test_clone tests to remove DV wait usage #4605

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

Open
ema-aka-young wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −8
Open

WIP: [Storage] Refactor test_clone tests to remove DV wait usage #4605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions tests/storage/cdi_clone/test_clone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from utilities.constants import (
OS_FLAVOR_FEDORA,
OS_FLAVOR_WINDOWS,
TIMEOUT_1MIN,
TIMEOUT_40MIN,
Images,
)
Expand Down Expand Up @@ -107,23 +106,19 @@ def test_successful_vm_restart_with_cloned_dv(
cluster_csi_drivers_names,
):
size = get_dv_size_from_datasource(data_source=fedora_data_source_scope_module)

with DataVolume(
name="dv-target",
with create_dv(
Copy link
Copy Markdown
Contributor

@jpeimer jpeimer Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There may be an issue with WFFC storage.

create_dv() creates a first consumer pod, which may put a PVC on a certain node, and if this node cannot accommodate our future VM, VM will never be scheduled.
The expected WFFC flow is to create a DV, leave it without the consumer, and then VM that wants to use it becomes its first consumer.

Copy link
Copy Markdown
Contributor Author

@ema-aka-young ema-aka-young Apr 28, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thank you. I'll revert this change.

Copy link
Copy Markdown
Contributor Author

@ema-aka-young ema-aka-young Apr 28, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jpeimer After some investigation, I noticed we could avoid having the dummy consumer pod setting consume_wffc to False

openshift-virtualization-tests/utilities/storage.py

Line 172 in 86f63e3

if sc_volume_binding_mode_is_wffc(sc=storage_class, client=client) and consume_wffc:

And we could have a conditional wait for DV success or pending population, depending on the storage class binding. Like we have in

openshift-virtualization-tests/tests/storage/cdi_import/conftest.py

Lines 163 to 166 in 86f63e3

if sc_volume_binding_mode_is_wffc(sc=storage_class_name_scope_module, client=unprivileged_client):
dv.wait_for_status(status=DataVolume.Status.PENDING_POPULATION, timeout=TIMEOUT_1MIN)
else:
dv.wait_for_dv_success(timeout=TIMEOUT_1MIN)

What do you think of this approach?

dv_name="dv-target",
namespace=namespace.name,
client=unprivileged_client,
size=size,
api_name="storage",
storage_class=storage_class_name_scope_module,
source_ref={
"kind": fedora_data_source_scope_module.kind,
"name": fedora_data_source_scope_module.name,
"namespace": fedora_data_source_scope_module.namespace,
},
) as cdv:
cdv.wait(timeout=TIMEOUT_1MIN, wait_for_exists_only=True)
cdv.pvc.wait()

cdv.wait_for_dv_success()
with create_vm_from_dv(
client=unprivileged_client,
dv=cdv,
Expand Down