Skip to content

Commit 8d2c2e4

Browse files
authored
[fix][test] Fix flaky AdminApiTest.partitionedTopicsCursorReset (#25847)
1 parent d3aeb55 commit 8d2c2e4

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3101,7 +3101,13 @@ public void partitionedTopicsCursorReset(String topicName) throws Exception {
31013101
assertEquals(receivedMessages.size(), 0);
31023102

31033103
consumer.close();
3104-
admin.topics().deleteSubscription(topicName, "my-sub");
3104+
// consumer.close() returns when the close request is dispatched, but the broker may not
3105+
// have processed the disconnect yet, so deleteSubscription can still see active consumers
3106+
// and return HTTP 412. Retry until the broker has detected the disconnect.
3107+
final String topicNameFinal = topicName;
3108+
Awaitility.await()
3109+
.ignoreExceptionsInstanceOf(PulsarAdminException.PreconditionFailedException.class)
3110+
.untilAsserted(() -> admin.topics().deleteSubscription(topicNameFinal, "my-sub"));
31053111
admin.topics().deletePartitionedTopic(topicName);
31063112
}
31073113

0 commit comments

Comments
 (0)