From a1835b0e88d84446315eb840c4d36d28c7df84f9 Mon Sep 17 00:00:00 2001 From: Zixuan Liu Date: Tue, 20 Sep 2022 14:49:57 +0800 Subject: [PATCH] [fix][broker] Fix create ns Signed-off-by: Zixuan Liu --- .../main/java/org/apache/pulsar/PulsarStandalone.java | 6 +----- .../java/org/apache/pulsar/PulsarStandaloneTest.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java index 4fd22eba785b9..ce46d460d5269 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java @@ -25,7 +25,6 @@ import com.google.common.collect.Sets; import java.io.File; import java.nio.file.Paths; -import java.util.Collections; import java.util.Optional; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.conf.ServerConfiguration; @@ -39,7 +38,6 @@ import org.apache.pulsar.common.naming.TopicName; import org.apache.pulsar.common.partition.PartitionedTopicMetadata; import org.apache.pulsar.common.policies.data.ClusterData; -import org.apache.pulsar.common.policies.data.Policies; import org.apache.pulsar.common.policies.data.TenantInfo; import org.apache.pulsar.common.util.ShutdownUtil; import org.apache.pulsar.functions.instance.state.PulsarMetadataStateStoreProviderImpl; @@ -394,9 +392,7 @@ void createNameSpace(String cluster, String publicTenant, NamespaceName ns) thro } if (!nsr.namespaceExists(ns)) { - Policies nsp = new Policies(); - nsp.replication_clusters = Collections.singleton(config.getClusterName()); - nsr.createPolicies(ns, nsp); + broker.getAdminClient().namespaces().createNamespace(ns.toString()); } } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarStandaloneTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarStandaloneTest.java index b7b62eccb514b..7061cb28b0f6d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarStandaloneTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarStandaloneTest.java @@ -26,6 +26,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import org.apache.pulsar.client.admin.Namespaces; +import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.common.naming.NamespaceName; import org.apache.pulsar.broker.PulsarService; import org.apache.pulsar.broker.ServiceConfiguration; @@ -61,12 +63,18 @@ public void testCreateNameSpace() throws Exception { when(resources.getTenantResources()).thenReturn(tr); when(resources.getNamespaceResources()).thenReturn(nsr); + Namespaces namespaces = mock(Namespaces.class); + doNothing().when(namespaces).createNamespace(any()); + PulsarAdmin admin = mock(PulsarAdmin.class); + when(admin.namespaces()).thenReturn(namespaces); + PulsarService broker = mock(PulsarService.class); when(broker.getPulsarResources()).thenReturn(resources); when(broker.getWebServiceAddress()).thenReturn("pulsar://localhost:8080"); when(broker.getWebServiceAddressTls()).thenReturn(null); when(broker.getBrokerServiceUrl()).thenReturn("pulsar://localhost:6650"); when(broker.getBrokerServiceUrlTls()).thenReturn(null); + when(broker.getAdminClient()).thenReturn(admin); ServiceConfiguration config = new ServiceConfiguration(); config.setClusterName(cluster); @@ -79,7 +87,8 @@ public void testCreateNameSpace() throws Exception { standalone.createNameSpace(cluster, tenant, ns); verify(cr, times(1)).createCluster(eq(cluster), any()); verify(tr, times(1)).createTenant(eq(tenant), any()); - verify(nsr, times(1)).createPolicies(eq(ns), any()); + verify(admin, times(1)).namespaces(); + verify(admin.namespaces(), times(1)).createNamespace(eq(ns.toString())); } }