Skip to content

Commit d0fa363

Browse files
authored
[fix][test] Fix flaky OneWayReplicatorUsingGlobalZKTest cleanup (#25313)
1 parent b171b05 commit d0fa363

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTestBase.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,14 @@ protected void cleanupPulsarResources() throws Exception {
306306
if (!usingGlobalZK) {
307307
admin2.namespaces().setNamespaceReplicationClusters(replicatedNamespace, Sets.newHashSet(cluster2), true);
308308
}
309-
admin1.namespaces().deleteNamespace(replicatedNamespace, true);
310-
admin1.namespaces().deleteNamespace(nonReplicatedNamespace, true);
309+
// When using global ZK, reducing replication clusters triggers async topic cleanup on removed clusters.
310+
// Retry namespace deletion to handle topics that may be in a transitional state.
311+
Awaitility.await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
312+
admin1.namespaces().deleteNamespace(replicatedNamespace, true);
313+
});
314+
Awaitility.await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
315+
admin1.namespaces().deleteNamespace(nonReplicatedNamespace, true);
316+
});
311317
if (!usingGlobalZK) {
312318
admin2.namespaces().deleteNamespace(replicatedNamespace, true);
313319
admin2.namespaces().deleteNamespace(nonReplicatedNamespace, true);

0 commit comments

Comments
 (0)