[pulsar] branch branch-2.11 updated: [fix][broker] Revert "Skip loading broker interceptor when disableBrokerInterceptors is true #20422" (#20710)

[technoboy]

This is an automated email from the ASF dual-hosted git repository.

technoboy pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.11 by this push:
     new 25d38320b51 [fix][broker] Revert "Skip loading broker interceptor when 
disableBrokerInterceptors is true #20422" (#20710)
25d38320b51 is described below

commit 25d38320b51c2fd0964f923a772082ec6004134d
Author: Jiwei Guo <techno...@apache.org>
AuthorDate: Wed Jul 5 09:29:03 2023 +0800

    [fix][broker] Revert "Skip loading broker interceptor when 
disableBrokerInterceptors is true #20422" (#20710)
---
 .../apache/pulsar/broker/ServiceConfiguration.java |  2 +-
 .../broker/intercept/BrokerInterceptors.java       |  5 -----
 .../broker/intercept/BrokerInterceptorTest.java    | 25 ----------------------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git 
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
 
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
index 965876fd0ab..754c74ab3e7 100644
--- 
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
+++ 
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
@@ -1292,7 +1292,7 @@ public class ServiceConfiguration implements 
PulsarConfiguration {
 
     @FieldContext(
         category = CATEGORY_SERVER,
-        doc = "Enable or disable the broker interceptor"
+        doc = "Enable or disable the broker interceptor, which is only used 
for testing for now"
     )
     private boolean disableBrokerInterceptors = true;
 
diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java
index 229c32cd141..6f71db312b7 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/intercept/BrokerInterceptors.java
@@ -58,11 +58,6 @@ public class BrokerInterceptors implements BrokerInterceptor 
{
      * @return the collection of broker event interceptor
      */
     public static BrokerInterceptor load(ServiceConfiguration conf) throws 
IOException {
-        if (conf.isDisableBrokerInterceptors()) {
-            log.info("Skip loading the broker interceptors when 
disableBrokerInterceptors is true");
-            return null;
-        }
-
         BrokerInterceptorDefinitions definitions =
                 
BrokerInterceptorUtils.searchForInterceptors(conf.getBrokerInterceptorsDirectory(),
                         conf.getNarExtractionDirectory());
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java
index 1f53ac632d8..455edacc7eb 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/BrokerInterceptorTest.java
@@ -20,12 +20,9 @@ package org.apache.pulsar.broker.intercept;
 
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -39,7 +36,6 @@ import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.Message;
@@ -264,25 +260,4 @@ public class BrokerInterceptorTest extends 
ProducerConsumerBase {
         }
     }
 
-    @Test
-    public void testLoadWhenDisableBrokerInterceptorsIsTrue() throws 
IOException {
-        ServiceConfiguration serviceConfiguration = 
spy(ServiceConfiguration.class);
-        serviceConfiguration.setDisableBrokerInterceptors(true);
-        BrokerInterceptor brokerInterceptor = 
BrokerInterceptors.load(serviceConfiguration);
-        assertNull(brokerInterceptor);
-
-        verify(serviceConfiguration, times(1)).isDisableBrokerInterceptors();
-        verify(serviceConfiguration, 
times(0)).getBrokerInterceptorsDirectory();
-    }
-
-    @Test
-    public void testLoadWhenDisableBrokerInterceptorsIsFalse() throws 
IOException {
-        ServiceConfiguration serviceConfiguration = 
spy(ServiceConfiguration.class);
-        serviceConfiguration.setDisableBrokerInterceptors(false);
-        BrokerInterceptor brokerInterceptor = 
BrokerInterceptors.load(serviceConfiguration);
-        assertNull(brokerInterceptor);
-
-        verify(serviceConfiguration, times(1)).isDisableBrokerInterceptors();
-        verify(serviceConfiguration, 
times(1)).getBrokerInterceptorsDirectory();
-    }
 }