-
Notifications
You must be signed in to change notification settings - Fork 3.7k
[feat][broker] PIP-469: Legacy-aware topic policies backend routing and metadata-store topic policies #25707
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.
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
Open
BewareMyPower
wants to merge
18
commits into
apache:master
Choose a base branch
from
BewareMyPower:bewaremypower/pip-469-impl
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
2aff9b3
[feat][broker] PIP-469: Legacy-aware topic policies backend routing a…
BewareMyPower 30a6220
fix: avoid duplicated listener if local and configuration metadata st…
BewareMyPower 7530092
fix: address comments
BewareMyPower 8e13d2e
Test initializations of various topic policies services
BewareMyPower 281772f
Change unit tests to integration tests
BewareMyPower 36afb62
chore: clean up unnecessary code
BewareMyPower e6b5d8f
chore: remove unnecessary caches from LegacyAwareTopicPoliciesService
BewareMyPower 6148a0f
refactor: add integration tests for both cases whether system topic i…
BewareMyPower f98f95a
fix: error logs from the metadata listener of NamespaceBundleFactory
BewareMyPower bd3adb6
fix: global policies listeners are not called
BewareMyPower d1fc536
chore: speed up TopicPoliciesTest
BewareMyPower 7d10d66
reuse TopicPoliciesTest for MetadataStoreTopicPoliciesService
BewareMyPower 055371f
chore: simplify tests
BewareMyPower a10dd0b
chore: improve tests for legacy aware
BewareMyPower 3e3ccb5
fix: ignore the __change_events topic created later
BewareMyPower 6b43d76
chore: remove unnecessary null checks
BewareMyPower b70a567
address comments
BewareMyPower 4c33be9
fix: add registerListenerAsync and skip start system topic policies
BewareMyPower File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
144 changes: 144 additions & 0 deletions
144
...roker/src/main/java/org/apache/pulsar/broker/service/LegacyAwareTopicPoliciesService.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.pulsar.broker.service; | ||
|
|
||
| import com.github.benmanes.caffeine.cache.AsyncCacheLoader; | ||
| import com.github.benmanes.caffeine.cache.AsyncLoadingCache; | ||
| import com.github.benmanes.caffeine.cache.Caffeine; | ||
| import com.google.common.annotations.VisibleForTesting; | ||
| import java.time.Duration; | ||
| import java.util.Optional; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.Executor; | ||
| import java.util.function.Consumer; | ||
| import lombok.CustomLog; | ||
| import org.apache.pulsar.broker.PulsarService; | ||
| import org.apache.pulsar.broker.systopic.NamespaceEventsSystemTopicFactory; | ||
| import org.apache.pulsar.common.events.EventType; | ||
| import org.apache.pulsar.common.naming.NamespaceName; | ||
| import org.apache.pulsar.common.naming.TopicName; | ||
| import org.apache.pulsar.common.policies.data.TopicPolicies; | ||
| import org.jspecify.annotations.NonNull; | ||
|
|
||
| /** | ||
| * Routes topic policy operations to the legacy system-topic backend when a namespace already has | ||
| * a topic-policy {@code __change_events} system topic, and otherwise to the configured backend. | ||
| */ | ||
| @CustomLog | ||
| public class LegacyAwareTopicPoliciesService implements TopicPoliciesService { | ||
|
|
||
| private final AsyncLoadingCache<NamespaceName, Boolean> isLegacyNamespace; | ||
| @VisibleForTesting | ||
| final SystemTopicBasedTopicPoliciesService systemTopicService; | ||
| private final TopicPoliciesService configuredService; | ||
|
|
||
| public LegacyAwareTopicPoliciesService(PulsarService pulsar, | ||
| SystemTopicBasedTopicPoliciesService systemTopicService, | ||
| TopicPoliciesService configuredService) { | ||
| // Generally, we only need to check if the __change_events topic exists once because the __change_events topic | ||
| // should only be created by broker before the upgrade, where `SystemTopicBasedTopicPoliciesService` is | ||
| // configured as the topic policies service. | ||
| this.isLegacyNamespace = Caffeine.newBuilder().expireAfterWrite(Duration.ofHours(1)) | ||
| .buildAsync(new AsyncCacheLoader<>() { | ||
| @NonNull | ||
| @Override | ||
| public CompletableFuture<? extends Boolean> asyncLoad(NamespaceName key, | ||
| @NonNull Executor executor) { | ||
| return NamespaceEventsSystemTopicFactory.checkSystemTopicExists(key, EventType.TOPIC_POLICY, | ||
| pulsar); | ||
| } | ||
| }); | ||
| this.systemTopicService = systemTopicService; | ||
| this.configuredService = configuredService; | ||
| if (configuredService instanceof SystemTopicBasedTopicPoliciesService) { | ||
| throw new IllegalArgumentException( | ||
| "configuredService should not be an instance of SystemTopicBasedTopicPoliciesService"); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void start(PulsarService pulsarService) { | ||
| // We should not call `systemTopicService.start()`, which just registers a namespace bundle listener to create | ||
| // a reader on `<namespace>/__change_events` when the namespace's bundle is loaded firstly. It's just an | ||
| // optimization to create the reader before loading any topic. However, it could create a reader on a namespace | ||
| // that does not even have the __change_events topic. | ||
| configuredService.start(pulsarService); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws Exception { | ||
| try { | ||
| configuredService.close(); | ||
| } finally { | ||
| systemTopicService.close(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableFuture<Optional<TopicPolicies>> getTopicPoliciesAsync(TopicName topicName, GetType type) { | ||
| return resolveService(topicName.getNamespaceObject()) | ||
| .thenCompose(service -> service.getTopicPoliciesAsync(topicName, type)); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableFuture<Void> updateTopicPoliciesAsync(TopicName topicName, boolean isGlobalPolicy, | ||
| boolean skipUpdateWhenTopicPolicyDoesntExist, | ||
| Consumer<TopicPolicies> policyUpdater) { | ||
| return resolveService(topicName.getNamespaceObject()) | ||
| .thenCompose(service -> service.updateTopicPoliciesAsync(topicName, isGlobalPolicy, | ||
| skipUpdateWhenTopicPolicyDoesntExist, policyUpdater)); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableFuture<Void> deleteTopicPoliciesAsync(TopicName topicName) { | ||
| return resolveService(topicName.getNamespaceObject()) | ||
| .thenCompose(service -> service.deleteTopicPoliciesAsync(topicName)); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableFuture<Void> deleteTopicPoliciesAsync(TopicName topicName, | ||
| boolean keepGlobalPoliciesAfterDeleting) { | ||
| return resolveService(topicName.getNamespaceObject()) | ||
| .thenCompose(service -> service.deleteTopicPoliciesAsync(topicName, | ||
| keepGlobalPoliciesAfterDeleting)); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableFuture<Boolean> registerListenerAsync(TopicName topicName, TopicPolicyListener listener) { | ||
| return resolveService(topicName.getNamespaceObject()) | ||
| .thenCompose(service -> service.registerListenerAsync(topicName, listener)); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean registerListener(TopicName topicName, TopicPolicyListener listener) { | ||
| throw new RuntimeException("should not be called"); | ||
| } | ||
|
|
||
| @Override | ||
| public void unregisterListener(TopicName topicName, TopicPolicyListener listener) { | ||
| configuredService.unregisterListener(topicName, listener); | ||
| systemTopicService.unregisterListener(topicName, listener); | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| CompletableFuture<TopicPoliciesService> resolveService(NamespaceName namespace) { | ||
| return isLegacyNamespace.get(namespace) | ||
| .thenApply(isLegacy -> isLegacy ? systemTopicService : configuredService); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.