Skip to content

[fix][broker] Disable EntryFilters for system topics #20514

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 2 commits into from
Jun 7, 2023
Merged

[fix][broker] Disable EntryFilters for system topics #20514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8f8100
[fix][broker] Disable EntryFilters for system topics
lhotari Jun 7, 2023
5113706
Merge remote-tracking branch 'origin/master' into lh-disable-entry-fi…
lhotari Jun 7, 2023
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
4 changes: 4 additions & 0 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,6 +1163,10 @@ public void updateResourceGroupLimiter(Optional<Policies> optPolicies) {
}

public void updateEntryFilters() {
if (isSystemTopic()) {
entryFilters = Pair.of(null, Collections.emptyList());
return;
}
final EntryFilters entryFiltersPolicy = getEntryFiltersPolicy();
if (entryFiltersPolicy == null || StringUtils.isBlank(entryFiltersPolicy.getEntryFilterNames())) {
entryFilters = Pair.of(null, Collections.emptyList());
Expand Down
3 changes: 2 additions & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public class EntryFilterSupport {

public EntryFilterSupport(Subscription subscription) {
this.subscription = subscription;
if (subscription != null && subscription.getTopic() != null) {
if (subscription != null && subscription.getTopic() != null
&& !subscription.getTopic().isSystemTopic()) {
final BrokerService brokerService = subscription.getTopic().getBrokerService();
final boolean allowOverrideEntryFilters = brokerService
.pulsar().getConfiguration().isAllowOverrideEntryFilters();
Expand Down
13 changes: 13 additions & 0 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,16 @@
*/
package org.apache.pulsar.broker.service.persistent;

import java.util.List;
import java.util.concurrent.CompletableFuture;
import org.apache.bookkeeper.mledger.ManagedLedger;
import org.apache.pulsar.broker.PulsarServerException;
import org.apache.pulsar.broker.namespace.NamespaceService;
import org.apache.pulsar.broker.service.BrokerService;
import org.apache.pulsar.broker.service.plugin.EntryFilter;
import org.apache.pulsar.common.naming.SystemTopicNames;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.EntryFilters;

public class SystemTopic extends PersistentTopic {

Expand Down Expand Up @@ -82,4 +85,14 @@ public boolean isEncryptionRequired() {
// System topics are only written by the broker that can't know the encryption context.
return false;
}

@Override
public EntryFilters getEntryFiltersPolicy() {
return null;
}

@Override
public List<EntryFilter> getEntryFilters() {
return null;
}
}