[pulsar] branch branch-2.8 updated: Fix cherry-pick issue

[penghui]

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

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


The following commit(s) were added to refs/heads/branch-2.8 by this push:
     new 922fcd4  Fix cherry-pick issue
922fcd4 is described below

commit 922fcd495ad167a0ea9a38cc9db8abd32cc1ece7
Author: penghui <peng...@apache.org>
AuthorDate: Fri Jul 30 14:57:56 2021 +0800

    Fix cherry-pick issue
---
 .../pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java | 6 ++----
 .../test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
index 53bc099..315de98 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
@@ -175,8 +175,7 @@ public class SystemTopicBasedTopicPoliciesService 
implements TopicPoliciesServic
     public CompletableFuture<Void> 
addOwnedNamespaceBundleAsync(NamespaceBundle namespaceBundle) {
         CompletableFuture<Void> result = new CompletableFuture<>();
         NamespaceName namespace = namespaceBundle.getNamespaceObject();
-        if (NamespaceService.checkHeartbeatNamespace(namespace) != null
-                || NamespaceService.checkHeartbeatNamespaceV2(namespace) != 
null) {
+        if (NamespaceService.checkHeartbeatNamespace(namespace) != null) {
             result.complete(null);
             return result;
         }
@@ -210,8 +209,7 @@ public class SystemTopicBasedTopicPoliciesService 
implements TopicPoliciesServic
     @Override
     public CompletableFuture<Void> 
removeOwnedNamespaceBundleAsync(NamespaceBundle namespaceBundle) {
         NamespaceName namespace = namespaceBundle.getNamespaceObject();
-        if (NamespaceService.checkHeartbeatNamespace(namespace) != null
-                || NamespaceService.checkHeartbeatNamespaceV2(namespace) != 
null) {
+        if (NamespaceService.checkHeartbeatNamespace(namespace) != null) {
             return CompletableFuture.completedFuture(null);
         }
         AtomicInteger bundlesCount = 
ownedBundlesCountPerNamespace.get(namespace);
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
index 035950e..bfb7715 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
@@ -2300,7 +2300,6 @@ public class TopicPoliciesTest extends 
MockedPulsarServiceBaseTest {
         pulsar.getBrokerService().getTopics().forEach((k, v) -> {
             TopicName topicName = TopicName.get(k);
             
assertNull(NamespaceService.checkHeartbeatNamespace(topicName.getNamespaceObject()));
-            
assertNull(NamespaceService.checkHeartbeatNamespaceV2(topicName.getNamespaceObject()));
         });
     }