[pulsar-manager] branch master updated: Use PulsarAdmin instead of HttpUtil in BrokerStatsServiceImpl (#315)

[guangning]

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

guangning pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-manager.git


The following commit(s) were added to refs/heads/master by this push:
     new f4b3f22  Use PulsarAdmin instead of HttpUtil in BrokerStatsServiceImpl 
(#315)
f4b3f22 is described below

commit f4b3f22c8c1b0f727ae55783caa8145ce6ab3565
Author: Kimura Takesi <35636173+cim...@users.noreply.github.com>
AuthorDate: Wed Jul 8 09:09:31 2020 +0900

    Use PulsarAdmin instead of HttpUtil in BrokerStatsServiceImpl (#315)
    
    Co-authored-by: Takesi Kimura <takes...@yahoo-corp.jp>
---
 .../manager/service/impl/BrokerStatsServiceImpl.java     | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git 
a/src/main/java/org/apache/pulsar/manager/service/impl/BrokerStatsServiceImpl.java
 
b/src/main/java/org/apache/pulsar/manager/service/impl/BrokerStatsServiceImpl.java
index 4e8114b..8788b1b 100644
--- 
a/src/main/java/org/apache/pulsar/manager/service/impl/BrokerStatsServiceImpl.java
+++ 
b/src/main/java/org/apache/pulsar/manager/service/impl/BrokerStatsServiceImpl.java
@@ -20,13 +20,13 @@ import com.google.gson.reflect.TypeToken;
 
 import java.text.DecimalFormat;
 
+import org.apache.pulsar.client.admin.Brokers;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import 
org.apache.pulsar.manager.controller.exception.PulsarAdminOperationException;
 import org.apache.pulsar.manager.service.BrokerStatsService;
 import org.apache.pulsar.manager.service.BrokersService;
 import org.apache.pulsar.manager.service.ClustersService;
 import org.apache.pulsar.manager.service.PulsarAdminService;
-import org.apache.pulsar.manager.utils.HttpUtil;
 import org.apache.pulsar.manager.entity.ConsumerStatsEntity;
 import org.apache.pulsar.manager.entity.ConsumersStatsRepository;
 import org.apache.pulsar.manager.entity.EnvironmentEntity;
@@ -44,7 +44,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -135,20 +134,17 @@ public class BrokerStatsServiceImpl implements 
BrokerStatsService {
                 String webServiceUrl = (String) clusterMap.get("serviceUrl");
                 if (webServiceUrl.contains(",")) {
                     String[] webServiceUrlList = webServiceUrl.split(",");
-                    if (StringUtils.isNotBlank(pulsarJwtToken)) {
-                        header.put("Authorization", String.format("Bearer %s", 
pulsarJwtToken));
-                    }
                     for (String url : webServiceUrlList) {
                         if (!url.contains("http://";)) {
                             url = "http://"; + url;
                         }
-                        // TODO Use Pulsar Admin instead of HttpUtil.
-                        String httpTestResult = HttpUtil.doGet( url + 
"/admin/v2/brokers/health", header);
-                        if (httpTestResult == null) {
-                            log.error("This service {} is down, please check", 
url);
-                        } else {
+                        try {
+                            Brokers brokers = pulsarAdminService.brokers(url);
+                            brokers.healthcheck();
                             webServiceUrl = url;
                             break;
+                        } catch (PulsarAdminException e) {
+                            log.error("This service {} is down, please check", 
url);
                         }
                     }
                 }