[fix][broker] Ignore the exception of creating namespace (apache#18837)

teaey · Dec 12, 2022 · bdbb118 · bdbb118
1 parent 1be5a69
commit bdbb118
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 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
@@ -393,7 +393,11 @@ void createNameSpace(String cluster, String publicTenant, NamespaceName ns) thro
         }
 
         if (!nsr.namespaceExists(ns)) {
-            broker.getAdminClient().namespaces().createNamespace(ns.toString());
+            try {
+                broker.getAdminClient().namespaces().createNamespace(ns.toString());
+            } catch (Exception e) {
+                log.warn("Failed to create the default namespace {}: {}", ns, e.getMessage());
+            }
         }
     }
 

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarStandaloneTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarStandaloneTest.java
@@ -21,6 +21,7 @@
 import static org.apache.commons.io.FileUtils.cleanDirectory;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -33,6 +34,7 @@
 import org.apache.bookkeeper.util.IOUtils;
 import org.apache.pulsar.client.admin.Namespaces;
 import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.common.naming.NamespaceName;
 import org.apache.pulsar.broker.PulsarService;
 import org.apache.pulsar.broker.ServiceConfiguration;
@@ -61,7 +63,7 @@ public void testCreateNameSpace() throws Exception {
         doNothing().when(tr).createTenant(eq(tenant), any());
 
         NamespaceResources nsr = mock(NamespaceResources.class);
-        when(nsr.namespaceExists(ns)).thenReturn(false).thenReturn(true);
+        when(nsr.namespaceExists(ns)).thenReturn(false).thenReturn(true).thenReturn(false);
         doNothing().when(nsr).createPolicies(eq(ns), any());
 
         PulsarResources resources = mock(PulsarResources.class);
@@ -95,6 +97,9 @@ public void testCreateNameSpace() throws Exception {
         verify(tr, times(1)).createTenant(eq(tenant), any());
         verify(admin, times(1)).namespaces();
         verify(admin.namespaces(), times(1)).createNamespace(eq(ns.toString()));
+
+        doThrow(new PulsarAdminException("No permission")).when(namespaces).createNamespace(any());
+        standalone.createNameSpace(cluster, tenant, ns);
     }
 
     @Test(groups = "broker")

diff --git a/...s/integration/src/test/java/org/apache/pulsar/tests/integration/standalone/SmokeTest.java b/...s/integration/src/test/java/org/apache/pulsar/tests/integration/standalone/SmokeTest.java
@@ -18,7 +18,12 @@
  */
 package org.apache.pulsar.tests.integration.standalone;
 
+import static org.testng.Assert.assertEquals;
 import java.util.function.Supplier;
+import lombok.Cleanup;
+import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.apache.pulsar.client.admin.PulsarAdminException;
+import org.apache.pulsar.client.api.PulsarClientException;
 import org.apache.pulsar.tests.integration.suites.PulsarStandaloneTestSuite;
 import org.testng.annotations.Test;
 
@@ -29,4 +34,13 @@ public void testPublishAndConsume(Supplier<String> serviceUrl, boolean isPersist
         super.testPublishAndConsume(serviceUrl.get(), isPersistent);
     }
 
+    @Test
+    public void testGetBundleRange() throws PulsarClientException, PulsarAdminException {
+        @Cleanup
+        PulsarAdmin admin = PulsarAdmin.builder().serviceHttpUrl(getHttpServiceUrl()).build();
+
+        String topic = "test-get-topic-bundle-range";
+        admin.topics().createNonPartitionedTopic(topic);
+        assertEquals(admin.lookups().getBundleRange(topic), "0xc0000000_0xffffffff");
+    }
 }
diff --git a/...rc/test/java/org/apache/pulsar/tests/integration/topologies/PulsarStandaloneTestBase.java b/...rc/test/java/org/apache/pulsar/tests/integration/topologies/PulsarStandaloneTestBase.java
@@ -121,4 +121,7 @@ protected void dumpFunctionLogs(String name) {
         }
     }
 
+    protected String getHttpServiceUrl() {
+        return container.getHttpServiceUrl();
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,4 +121,7 @@ protected void dumpFunctionLogs(String name) { @@
             }
         }
+        protected String getHttpServiceUrl() {
+            return container.getHttpServiceUrl();
+        }
     }