Skip to content

Commit

Permalink
remove garbage collector dead code
Browse files Browse the repository at this point in the history
  • Loading branch information
Ahmad-Hafe committed Jan 2, 2025
1 parent 0d654cd commit 4dcafeb
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion ocp_resources/datavolume.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
from ocp_resources.resource import NamespacedResource, Resource
from timeout_sampler import TimeoutExpiredError, TimeoutSampler
from warnings import warn

gc_deprecatio_warning = ("garbage collector is removed in version v1.62 and going to be deprecated", DeprecationWarning)


class DataVolume(NamespacedResource):
Expand Down Expand Up @@ -281,7 +284,7 @@ def wait_for_dv_success(
Args:
timeout (int): Time to wait for the DataVolume to succeed.
failure_timeout (int): Time to wait for the DataVolume to have not Pending/None status
dv_garbage_collection_enabled (bool, default: False): if True, expect that DV will disappear after success
dv_garbage_collection_enabled (bool, default: False): garbage collector is removed in version v1.62 and going to be deprecated
stop_status_func (function): function that is called inside the TimeoutSampler
if it returns True - stop the Sampler and raise TimeoutExpiredError
Example:
Expand All @@ -307,6 +310,8 @@ def test_dv():
wait_timeout=timeout,
func=lambda: self.exists,
):
if dv_garbage_collection_enabled is not None:
warn(gc_deprecatio_warning)
# DV reach success if the status is Succeeded, or if DV garbage collection enabled and the DV does not exist
if sample and sample.get("status", {}).get("phase") == self.Status.SUCCEEDED:
break
Expand Down Expand Up @@ -341,6 +346,7 @@ def delete(self, wait=False, timeout=TIMEOUT_4MINUTES, body=None):
"""
# if garbage collector is enabled, DV will be deleted after success
if self.exists:
warn(gc_deprecatio_warning)
return super().delete(wait=wait, timeout=timeout, body=body)
else:
return self.pvc.delete(wait=wait, timeout=timeout, body=body)

0 comments on commit 4dcafeb

Please sign in to comment.