diff --git a/tests/rptest/archival/s3_client.py b/tests/rptest/archival/s3_client.py index ec4cf1c3d794..a47deb5f2f38 100644 --- a/tests/rptest/archival/s3_client.py +++ b/tests/rptest/archival/s3_client.py @@ -122,8 +122,7 @@ def bucket_is_listable(): f"Bucket {name} didn't become visible to ListObjectsvv2 requests") def empty_and_delete_bucket(self, name, parallel=False): - failed_deletions = self.cloud_storage_client.empty_bucket( - self._si_settings.cloud_storage_bucket, parallel=parallel) + failed_deletions = self.empty_bucket(name, parallel=parallel) assert len(failed_deletions) == 0 self.delete_bucket(name) diff --git a/tests/rptest/services/redpanda.py b/tests/rptest/services/redpanda.py index 79b893e88a45..30312bc8797a 100644 --- a/tests/rptest/services/redpanda.py +++ b/tests/rptest/services/redpanda.py @@ -2844,7 +2844,15 @@ def add_to_started_nodes(self, node): def clean(self, **kwargs): super().clean(**kwargs) if self.cloud_storage_client: - self.delete_bucket_from_si() + try: + self.delete_bucket_from_si() + except Exception as e: + self.logger.error( + f"Failed to remove bucket {self._si_settings.cloud_storage_bucket}." + f" This may cause running out of quota in the cloud env. Please investigate: {e}" + ) + + raise e def clean_node(self, node,