You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by zi...@apache.org on 2022/06/29 02:52:40 UTC

[inlong] branch master updated: [INLONG-4803][DataProxy] Add warn log when there is no mq info when start for the first time (#4804)

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

zirui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new dea5b9524 [INLONG-4803][DataProxy] Add warn log when there is no mq info when start for the first time (#4804)
dea5b9524 is described below

commit dea5b9524f25a30237657c7917872899c5231e67
Author: Charles Zhang <do...@apache.org>
AuthorDate: Wed Jun 29 10:52:36 2022 +0800

    [INLONG-4803][DataProxy] Add warn log when there is no mq info when start for the first time (#4804)
---
 .../org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java | 5 ++++-
 .../inlong/manager/web/controller/openapi/DataProxyController.java   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java
index 50eb06f81..dad0da6d4 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/pulsar/PulsarClientService.java
@@ -136,6 +136,10 @@ public class PulsarClientService {
     }
 
     public void initCreateConnection(CreatePulsarClientCallBack callBack) {
+        if (pulsarUrl2token.isEmpty()) {
+            logger.warn("Failed to get Pulsar Cluster, make sure register pulsar to manager successfully.");
+            return;
+        }
         try {
             createConnection(callBack);
         } catch (FlumeException e) {
@@ -289,7 +293,6 @@ public class PulsarClientService {
         }
         pulsarClients = new ConcurrentHashMap<>();
         pulsarUrl2token = ConfigManager.getInstance().getMqClusterUrl2Token();
-        Preconditions.checkState(!pulsarUrl2token.isEmpty(), "No pulsar server url specified");
         logger.debug("number of pulsar cluster is {}", pulsarUrl2token.size());
         for (Map.Entry<String, String> info : pulsarUrl2token.entrySet()) {
             try {
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/DataProxyController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/DataProxyController.java
index 802310138..795561c72 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/DataProxyController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/DataProxyController.java
@@ -65,7 +65,7 @@ public class DataProxyController {
             @RequestParam(required = true) String clusterName) {
         DataProxyConfig config = clusterService.getDataProxyConfig(clusterTag, clusterName);
         if (CollectionUtils.isEmpty(config.getMqClusterList()) || CollectionUtils.isEmpty(config.getTopicList())) {
-            return Response.fail("failed to get mq clusters or topics");
+            return Response.fail("Failed to get MQ Cluster or Topic, make sure Cluster registered or Topic existed.");
         }
         return Response.success(config);
     }