[improve][admin] Improve BrokerStats.allocatorStats (apache#23242)

nodece · Sep 2, 2024 · 019ae9f · 019ae9f
1 parent 8da3bf8
commit 019ae9f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java
@@ -54,6 +54,8 @@ public static AllocatorStats generate(String allocatorName) {
         stats.numDirectArenas = allocator.metric().numDirectArenas();
         stats.numHeapArenas = allocator.metric().numHeapArenas();
         stats.numThreadLocalCaches = allocator.metric().numThreadLocalCaches();
+        stats.usedHeapMemory = allocator.metric().usedHeapMemory();
+        stats.usedDirectMemory = allocator.metric().usedDirectMemory();
         stats.normalCacheSize = allocator.metric().normalCacheSize();
         stats.smallCacheSize = allocator.metric().smallCacheSize();
         return stats;

diff --git a/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/AllocatorStats.java b/pulsar-client-admin-api/src/main/java/org/apache/pulsar/common/stats/AllocatorStats.java
@@ -29,6 +29,8 @@ public class AllocatorStats {
     public int numThreadLocalCaches;
     public int normalCacheSize;
     public int smallCacheSize;
+    public long usedDirectMemory;
+    public long usedHeapMemory;
 
     public List<PoolArenaStats> directArenas;
     public List<PoolArenaStats> heapArenas;

diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
@@ -199,6 +199,10 @@ public void brokerStats() throws Exception {
         doReturn("null").when(mockBrokerStats).getMetrics();
         brokerStats.run(split("monitoring-metrics"));
         verify(mockBrokerStats).getMetrics();
+
+        doReturn(null).when(mockBrokerStats).getAllocatorStats("default");
+        brokerStats.run(split("allocator-stats default"));
+        verify(mockBrokerStats).getAllocatorStats("default");
     }
 
     @Test