You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2023/06/07 19:55:11 UTC
[pulsar] branch branch-3.0 updated (9385e3878bd -> fb7fb8f13f3)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a change to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from 9385e3878bd [fix][test] Reduce flakiness of AdminApi2Test (#20529)
new 6bea518f1c4 [improve][build] Upgrade Testcontainers to 1.18.3 & docker-java to 3.3.0 (#20531)
new fb7fb8f13f3 [fix][broker] Disable EntryFilters for system topics (#20514)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 4 ++--
.../org/apache/pulsar/broker/service/AbstractTopic.java | 4 ++++
.../apache/pulsar/broker/service/EntryFilterSupport.java | 3 ++-
.../pulsar/broker/service/persistent/SystemTopic.java | 13 +++++++++++++
4 files changed, 21 insertions(+), 3 deletions(-)
[pulsar] 02/02: [fix][broker] Disable EntryFilters for system topics (#20514)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit fb7fb8f13f3f00189b758f0a60ea388ad693a389
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Wed Jun 7 22:52:13 2023 +0300
[fix][broker] Disable EntryFilters for system topics (#20514)
(cherry picked from commit ac46e2e4fc48dff74233623afa3635ef5285e34d)
---
.../org/apache/pulsar/broker/service/AbstractTopic.java | 4 ++++
.../apache/pulsar/broker/service/EntryFilterSupport.java | 3 ++-
.../pulsar/broker/service/persistent/SystemTopic.java | 13 +++++++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
index 4614b846c8e..1371019be41 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
@@ -1163,6 +1163,10 @@ public abstract class AbstractTopic implements Topic, TopicPolicyListener<TopicP
}
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());
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java
index 4a9b33a9afd..03d6f0750e0 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/EntryFilterSupport.java
@@ -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();
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java
index 395a8c9075e..720ae3c5189 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java
@@ -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 {
@@ -82,4 +85,14 @@ public class SystemTopic extends PersistentTopic {
// 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;
+ }
}
[pulsar] 01/02: [improve][build] Upgrade Testcontainers to 1.18.3 & docker-java to 3.3.0 (#20531)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 6bea518f1c4795ef3577de6b12f89ecddaf295a2
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Wed Jun 7 22:51:39 2023 +0300
[improve][build] Upgrade Testcontainers to 1.18.3 & docker-java to 3.3.0 (#20531)
(cherry picked from commit fe556ab8ac268543004b854dbd7a59e20756dff7)
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index cd82fd9ce39..1feadb9d5b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,11 +250,11 @@ flexible messaging model and an intuitive client API.</description>
<netty-reactive-streams.version>2.0.6</netty-reactive-streams.version>
<!-- test dependencies -->
- <testcontainers.version>1.17.6</testcontainers.version>
+ <testcontainers.version>1.18.3</testcontainers.version>
<hamcrest.version>2.2</hamcrest.version>
<!-- Set docker-java.version to the version of docker-java used in Testcontainers -->
- <docker-java.version>3.2.13</docker-java.version>
+ <docker-java.version>3.3.0</docker-java.version>
<kerby.version>1.1.1</kerby.version>
<testng.version>7.7.1</testng.version>
<mockito.version>3.12.4</mockito.version>