Skip to content
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

[fix] [broker] fix replicated namespaces filter in filterAndUnloadMatchedNamespaceAsync #23100

Merged
merged 15 commits into from
Jul 31, 2024
Merged

[fix] [broker] fix replicated namespaces filter in filterAndUnloadMatchedNamespaceAsync #23100

Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
debf0ff
fix ns isolation policy for repl namespaces
iosdev747 Jul 29, 2024
81ba58a
Revert "fix ns isolation policy for repl namespaces"
iosdev747 Jul 29, 2024
670f9a2
fix ns isolation policy for repl namespaces
iosdev747 Jul 29, 2024
32da100
fix admin tests
iosdev747 Jul 29, 2024
e58e79e
Merge remote-tracking branch 'origin/master' into fixIsolationPolicy
iosdev747 Jul 29, 2024
00819ec
remove unused import
iosdev747 Jul 29, 2024
a2e37fe
add unload bundle flag in pulsar admin (+CLI) and change default
iosdev747 Jul 29, 2024
ebcd1f1
Merge remote-tracking branch 'upstream/master' into fixNSClustersInPo…
iosdev747 Jul 30, 2024
70cd51d
Revert "add unload bundle flag in pulsar admin (+CLI) and change defa…
iosdev747 Jul 30, 2024
8518315
Revert "fix admin tests"
iosdev747 Jul 30, 2024
7bd978f
revert flag changes
iosdev747 Jul 30, 2024
22de125
get policy post ns filter
iosdev747 Jul 30, 2024
7a6e0d5
Make filterAndUnloadMatchedNamespaceAsync asynchronous
lhotari Jul 30, 2024
b8746a4
add multi broker ns isolation policy test for repl ns
iosdev747 Jul 30, 2024
13bf97a
test cleanup
iosdev747 Jul 30, 2024
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
14 changes: 10 additions & 4 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,8 +723,8 @@ public void setNamespaceIsolationPolicy(
).thenCompose(nsIsolationPolicies -> {
nsIsolationPolicies.setPolicy(policyName, policyData);
return namespaceIsolationPolicies()
.setIsolationDataAsync(cluster, old -> nsIsolationPolicies.getPolicies());
}).thenCompose(__ -> filterAndUnloadMatchedNamespaceAsync(policyData))
.setIsolationDataAsync(cluster, old -> nsIsolationPolicies.getPolicies());
}).thenCompose(__ -> filterAndUnloadMatchedNamespaceAsync(cluster, policyData))
.thenAccept(__ -> {
log.info("[{}] Successful to update clusters/{}/namespaceIsolationPolicies/{}.",
clientAppId(), cluster, policyName);
Expand Down Expand Up @@ -758,7 +758,8 @@ public void setNamespaceIsolationPolicy(
/**
* Get matched namespaces; call unload for each namespaces.
*/
private CompletableFuture<Void> filterAndUnloadMatchedNamespaceAsync(NamespaceIsolationDataImpl policyData) {
private CompletableFuture<Void> filterAndUnloadMatchedNamespaceAsync(String cluster,
NamespaceIsolationDataImpl policyData) {
PulsarAdmin adminClient;
try {
adminClient = pulsar().getAdminClient();
Expand All @@ -771,10 +772,15 @@ private CompletableFuture<Void> filterAndUnloadMatchedNamespaceAsync(NamespaceIs
.map(tenant -> adminClient.namespaces().getNamespacesAsync(tenant));
return FutureUtil.waitForAll(completableFutureStream)
.thenApply(namespaces -> {
// if namespace match any policy regex, add it to ns list to be unload.
// Filter namespaces that have current cluster in their replication_clusters
// if namespace match any policy regex, add it to ns list to be unloaded.
return namespaces.stream()
.filter(namespaceName ->
policyData.getNamespaces().stream().anyMatch(namespaceName::matches))
.filter(namespaceName -> adminClient.namespaces()
.getPoliciesAsync(namespaceName)
.thenApply(policies -> policies.replication_clusters.contains(cluster))
.join())
lhotari marked this conversation as resolved.
Show resolved Hide resolved
.collect(Collectors.toList());
});
}).thenCompose(shouldUnloadNamespaces -> {
Expand Down
Loading