Merge pull request redpanda-data#11632 from VladLazar/fix-s3-bucket-d…

…eletion rptest: fix S3 bucket deletion
NyaliaLui · Jun 23, 2023 · 1e38bb0 · 1e38bb0
2 parents 6b18cb6 + 0cb8c59
commit 1e38bb0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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,