Skip to content

[fix][test] Fix flaky OneWayReplicatorUsingGlobalZKTest cleanup #25313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lhotari merged 1 commit into from
Mar 12, 2026
+8 −2
Merged

[fix][test] Fix flaky OneWayReplicatorUsingGlobalZKTest cleanup #25313

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,14 @@ protected void cleanupPulsarResources() throws Exception {
if (!usingGlobalZK) {
admin2.namespaces().setNamespaceReplicationClusters(replicatedNamespace, Sets.newHashSet(cluster2), true);
}
admin1.namespaces().deleteNamespace(replicatedNamespace, true);
admin1.namespaces().deleteNamespace(nonReplicatedNamespace, true);
// When using global ZK, reducing replication clusters triggers async topic cleanup on removed clusters.
// Retry namespace deletion to handle topics that may be in a transitional state.
Awaitility.await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
admin1.namespaces().deleteNamespace(replicatedNamespace, true);
});
Awaitility.await().atMost(Duration.ofSeconds(30)).ignoreExceptions().untilAsserted(() -> {
admin1.namespaces().deleteNamespace(nonReplicatedNamespace, true);
});
if (!usingGlobalZK) {
admin2.namespaces().deleteNamespace(replicatedNamespace, true);
admin2.namespaces().deleteNamespace(nonReplicatedNamespace, true);
Expand Down
Loading