From 2089ac5004f9bbacb65551f33c8d08759b3bfae0 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Thu, 21 Nov 2024 13:28:54 -0800 Subject: [PATCH 1/3] test: improve timeout error message Signed-off-by: Noah Watkins --- tests/rptest/tests/topic_delete_test.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/rptest/tests/topic_delete_test.py b/tests/rptest/tests/topic_delete_test.py index 7ddf0b7cf0949..808c5e24a4954 100644 --- a/tests/rptest/tests/topic_delete_test.py +++ b/tests/rptest/tests/topic_delete_test.py @@ -628,9 +628,13 @@ def topic_delete_unavailable_test(self, cloud_storage_type): assert self.topic not in self.kafka_tools.list_topics() # Local storage deletion should proceed even if remote can't - wait_until(lambda: topic_storage_purged(self.redpanda, self.topic), - timeout_sec=30, - backoff_sec=1) + wait_until( + lambda: topic_storage_purged(self.redpanda, self.topic), + timeout_sec=30, + backoff_sec=1, + err_msg= + "Local storage purge did not complete while cloud storage was unavailable" + ) # Erase timeout is hardcoded 60 seconds, wait long enough # for it to give up. From 2496ac0264030d0c234f635891927b4eb56e297c Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Thu, 21 Nov 2024 15:37:52 -0800 Subject: [PATCH 2/3] test: log more detail about undeleted files Signed-off-by: Noah Watkins --- tests/rptest/tests/topic_delete_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/rptest/tests/topic_delete_test.py b/tests/rptest/tests/topic_delete_test.py index 808c5e24a4954..efa70bdbc212e 100644 --- a/tests/rptest/tests/topic_delete_test.py +++ b/tests/rptest/tests/topic_delete_test.py @@ -111,7 +111,8 @@ def topic_storage_purged(redpanda, topic_name): for topic_name, topic in ns.topics.items(): for p_id, p in topic.partitions.items(): for f in p.files: - redpanda.logger.info(f" {n.name}: {f}") + redpanda.logger.info( + f" {n.name}: {topic_name}_{p_id}_{f}") return False From 8e0c6070b65fae06ecb0cd3067e29fe4be64758a Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Thu, 21 Nov 2024 15:37:59 -0800 Subject: [PATCH 3/3] test: provide more time for deletions to occur MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I see the last check in ducktape was [INFO - 2024-11-21 01:58:41,459 - topic_delete_test - topic_storage_purged - lineno:114]: ip-172-31-45-99: 54-1-v1.log And the “removed:” line in the broker logs was DEBUG 2024-11-21 01:58:42,717 [shard 1:main] storage - segment.cc:171 - removed: "/var/lib/redpanda/data/kafka/topic-rmahmpbiye/2_29/54-1-v1.log" size 1048868 which was 1 second later. This appears to just be a race. Signed-off-by: Noah Watkins --- tests/rptest/tests/topic_delete_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/rptest/tests/topic_delete_test.py b/tests/rptest/tests/topic_delete_test.py index efa70bdbc212e..0ca44d50429eb 100644 --- a/tests/rptest/tests/topic_delete_test.py +++ b/tests/rptest/tests/topic_delete_test.py @@ -631,8 +631,8 @@ def topic_delete_unavailable_test(self, cloud_storage_type): # Local storage deletion should proceed even if remote can't wait_until( lambda: topic_storage_purged(self.redpanda, self.topic), - timeout_sec=30, - backoff_sec=1, + timeout_sec=90, + backoff_sec=10, err_msg= "Local storage purge did not complete while cloud storage was unavailable" )