Skip to content

Commit

Permalink
Merge pull request redpanda-data#24460 from WillemKauf/archive_retent…
Browse files Browse the repository at this point in the history
…ion_test_fix

[CORE-8278] `rptest`: adjust `num_segments_deleted()` condition
  • Loading branch information
WillemKauf authored Dec 6, 2024
2 parents ca91536 + d2d6f85 commit dc46444
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tests/rptest/tests/archive_retention_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ def new_manifest_spilled():
f"waiting until {segments_to_delete} segments will be removed")
# Wait for the first truncation to the middle of the archive
wait_until(
lambda: self.num_segments_deleted() == segments_to_delete,
lambda: self.num_segments_deleted() >= segments_to_delete,
timeout_sec=100,
backoff_sec=5,
err_msg=
f"Segments were not removed from the cloud, expected {segments_to_delete} deletions"
f"Segments were not removed from the cloud, expected at least {segments_to_delete} deletions"
)

view.reset()
Expand Down Expand Up @@ -210,11 +210,11 @@ def new_manifest_spilled():
f"waiting until {segments_to_delete} segments will be removed")
# Wait for the second truncation of the entire archive
wait_until(
lambda: self.num_segments_deleted() == segments_to_delete,
lambda: self.num_segments_deleted() >= segments_to_delete,
timeout_sec=120,
backoff_sec=5,
err_msg=
f"Segments were not removed from the cloud, expected {segments_to_delete} "
f"Segments were not removed from the cloud, expected at least {segments_to_delete} "
f"segments to be removed but only {self.num_segments_deleted()} was actually removed"
)

Expand Down

0 comments on commit dc46444

Please sign in to comment.