Skip to content

CherryPicked: [v4.14] Add wait_for_exists_only option to DataVolume wait() #1684

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

Merged
merged 1 commit into from
Feb 25, 2024
Merged

CherryPicked: [v4.14] Add wait_for_exists_only option to DataVolume wait() #1684

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
13 changes: 8 additions & 5 deletions ocp_resources/datavolume.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,15 @@ def wait_deleted(self, timeout=TIMEOUT_4MINUTES):
super().wait_deleted(timeout=timeout)
return self.pvc.wait_deleted(timeout=timeout)

def wait(self, timeout=TIMEOUT_10MINUTES, failure_timeout=TIMEOUT_2MINUTES):
self._check_none_pending_status(failure_timeout=failure_timeout)
def wait(self, timeout=TIMEOUT_10MINUTES, failure_timeout=TIMEOUT_2MINUTES, wait_for_exists_only=False):
if wait_for_exists_only:
return super().wait(timeout=timeout)
else:
self._check_none_pending_status(failure_timeout=failure_timeout)

# If DV's status is not Pending, continue with the flow
self.wait_for_status(status=self.Status.SUCCEEDED, timeout=timeout)
self.pvc.wait_for_status(status=PersistentVolumeClaim.Status.BOUND, timeout=timeout)
# If DV's status is not Pending, continue with the flow
self.wait_for_status(status=self.Status.SUCCEEDED, timeout=timeout)
self.pvc.wait_for_status(status=PersistentVolumeClaim.Status.BOUND, timeout=timeout)

@property
def pvc(self):
Expand Down