Fix some async method problems at PersistentTopicsBase. (apache#6483)

jiazhai · Mar 6, 2020 · 47ca8e6 · 47ca8e6
1 parent 329e231
commit 47ca8e6
Show file tree

Hide file tree

Showing 2 changed files with 610 additions and 457 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
@@ -571,16 +571,24 @@ protected ZooKeeperChildrenCache failureDomainListCache() {
 
     protected CompletableFuture<PartitionedTopicMetadata> getPartitionedTopicMetadataAsync(
             TopicName topicName, boolean authoritative, boolean checkAllowAutoCreation) {
-        validateClusterOwnership(topicName.getCluster());
-        // validates global-namespace contains local/peer cluster: if peer/local cluster present then lookup can
-        // serve/redirect request else fail partitioned-metadata-request so, client fails while creating
-        // producer/consumer
-        validateGlobalNamespaceOwnership(topicName.getNamespaceObject());
+        try {
+            validateClusterOwnership(topicName.getCluster());
+            // validates global-namespace contains local/peer cluster: if peer/local cluster present then lookup can
+            // serve/redirect request else fail partitioned-metadata-request so, client fails while creating
+            // producer/consumer
+            validateGlobalNamespaceOwnership(topicName.getNamespaceObject());
+        } catch (Exception e) {
+            return FutureUtil.failedFuture(e);
+        }
 
         try {
             checkConnect(topicName);
         } catch (WebApplicationException e) {
-            validateAdminAccessForTenant(topicName.getTenant());
+            try {
+                validateAdminAccessForTenant(topicName.getTenant());
+            } catch (Exception ex) {
+                return FutureUtil.failedFuture(ex);
+            }
         } catch (Exception e) {
             // unknown error marked as internal server error
             log.warn("Unexpected error while authorizing lookup. topic={}, role={}. Error: {}", topicName,