merlimat closed pull request #1469: Add v2 support for broker stats in the
admin client.
URL: https://github.com/apache/incubator-pulsar/pull/1469
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
index a8a2e5225..bd4d9e9c0 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/stats/client/PulsarBrokerStatsClientTest.java
@@ -81,7 +81,7 @@ public void testServiceException() throws Exception {
// Ok
}
try {
- client.getBrokerResourceAvailability("prop", "cluster", "ns");
+ client.getBrokerResourceAvailability("prop/cluster/ns");
} catch (PulsarAdminException e) {
// Ok
}
diff --git
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokerStatsImpl.java
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokerStatsImpl.java
index 6dbe20e9b..86c0317b8 100644
---
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokerStatsImpl.java
+++
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokerStatsImpl.java
@@ -23,6 +23,7 @@
import org.apache.pulsar.client.admin.BrokerStats;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.api.Authentication;
+import org.apache.pulsar.common.naming.NamespaceName;
import org.apache.pulsar.common.stats.AllocatorStats;
import org.apache.pulsar.policies.data.loadbalancer.LoadManagerReport;
import org.apache.pulsar.policies.data.loadbalancer.LocalBrokerData;
@@ -39,16 +40,18 @@
public class BrokerStatsImpl extends BaseResource implements BrokerStats {
private final WebTarget adminBrokerStats;
+ private final WebTarget adminV2BrokerStats;
public BrokerStatsImpl(WebTarget target, Authentication auth) {
super(auth);
adminBrokerStats = target.path("/admin/broker-stats");
+ adminV2BrokerStats = target.path("/admin/v2/broker-stats");
}
@Override
public JsonArray getMetrics() throws PulsarAdminException {
try {
- String json =
request(adminBrokerStats.path("/metrics")).get(String.class);
+ String json =
request(adminV2BrokerStats.path("/metrics")).get(String.class);
return new Gson().fromJson(json, JsonArray.class);
} catch (Exception e) {
throw getApiException(e);
@@ -58,7 +61,7 @@ public JsonArray getMetrics() throws PulsarAdminException {
@Override
public AllocatorStats getAllocatorStats(String allocatorName) throws
PulsarAdminException {
try {
- return
request(adminBrokerStats.path("/allocator-stats").path(allocatorName)).get(AllocatorStats.class);
+ return
request(adminV2BrokerStats.path("/allocator-stats").path(allocatorName)).get(AllocatorStats.class);
} catch (Exception e) {
throw getApiException(e);
}
@@ -67,7 +70,7 @@ public AllocatorStats getAllocatorStats(String allocatorName)
throws PulsarAdmin
@Override
public JsonArray getMBeans() throws PulsarAdminException {
try {
- String json =
request(adminBrokerStats.path("/mbeans")).get(String.class);
+ String json =
request(adminV2BrokerStats.path("/mbeans")).get(String.class);
return new Gson().fromJson(json, JsonArray.class);
} catch (Exception e) {
throw getApiException(e);
@@ -77,7 +80,7 @@ public JsonArray getMBeans() throws PulsarAdminException {
@Override
public JsonObject getTopics() throws PulsarAdminException {
try {
- String json =
request(adminBrokerStats.path("/destinations")).get(String.class);
+ String json =
request(adminV2BrokerStats.path("/destinations")).get(String.class);
return new Gson().fromJson(json, JsonObject.class);
} catch (Exception e) {
throw getApiException(e);
@@ -87,7 +90,7 @@ public JsonObject getTopics() throws PulsarAdminException {
@Override
public LoadManagerReport getLoadReport() throws PulsarAdminException {
try {
- return
request(adminBrokerStats.path("/load-report")).get(LocalBrokerData.class);
+ return
request(adminV2BrokerStats.path("/load-report")).get(LocalBrokerData.class);
} catch (Exception e) {
throw getApiException(e);
}
@@ -96,19 +99,18 @@ public LoadManagerReport getLoadReport() throws
PulsarAdminException {
@Override
public JsonObject getPendingBookieOpsStats() throws PulsarAdminException {
try {
- String json =
request(adminBrokerStats.path("/bookieops")).get(String.class);
+ String json =
request(adminV2BrokerStats.path("/bookieops")).get(String.class);
return new Gson().fromJson(json, JsonObject.class);
} catch (Exception e) {
throw getApiException(e);
}
}
- public JsonObject getBrokerResourceAvailability(String property, String
cluster, String namespace)
- throws PulsarAdminException {
+ public JsonObject getBrokerResourceAvailability(String namespace) throws
PulsarAdminException {
try {
- String json = request(
-
adminBrokerStats.path("/broker-resource-availability").path(property).path(cluster).path(namespace))
- .get(String.class);
+ NamespaceName ns = NamespaceName.get(namespace);
+ WebTarget admin = ns.isV2() ? adminV2BrokerStats :
adminBrokerStats;
+ String json =
request(admin.path("/broker-resource-availability").path(ns.toString())).get(String.class);
return new Gson().fromJson(json, JsonObject.class);
} catch (Exception e) {
throw getApiException(e);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
