Skip to content

Commit

Permalink
ducktape/cloud_storage: Wait for at least two spillovers
Browse files Browse the repository at this point in the history
When creating a manifest for reset we drop the first spillover and then
use the rest of the spillovers to craft a new manifest. If only one
spillover has been uploaded, then after dropping the first entry nothing
is left to craft the manifest.

This change makes the test wait until more than one manifest is spilled
over.

(cherry picked from commit 7061107)
  • Loading branch information
abhijat authored and vbotbuildovich committed Oct 16, 2023
1 parent 64cd00f commit f6e2d3f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tests/rptest/tests/e2e_shadow_indexing_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,8 @@ def __call__(self) -> bool:
self.test_instance.topic, 0)
self.spillover_manifests = s3_snapshot.get_spillover_manifests(
NTP("kafka", self.test_instance.topic, 0))
if not self.spillover_manifests:
if not self.spillover_manifests or len(
self.spillover_manifests) < 2:
return False
manifest_keys = set(self.manifest['segments'].keys())
spillover_keys = set()
Expand Down

0 comments on commit f6e2d3f

Please sign in to comment.