(pulsar) branch master updated: [improve][admin] Improve BrokerStats.allocatorStats (#23242)

[technoboy]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 019ae9f0d0e [improve][admin] Improve BrokerStats.allocatorStats 
(#23242)
019ae9f0d0e is described below

commit 019ae9f0d0ec961389bd093e7350ca6e23c3f496
Author: 道君 <dao...@apache.org>
AuthorDate: Mon Sep 2 21:31:07 2024 +0800

    [improve][admin] Improve BrokerStats.allocatorStats (#23242)
---
 .../java/org/apache/pulsar/broker/stats/AllocatorStatsGenerator.java  | 2 ++
 .../src/main/java/org/apache/pulsar/common/stats/AllocatorStats.java  | 2 ++
 .../test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java    | 4 ++++
 3 files changed, 8 insertions(+)

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
index 677b04d8a74..d20aef90adc 100644
--- 
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 class AllocatorStatsGenerator {
         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
index 3dbe831053a..aa23e2f7553 100644
--- 
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
index 6e9782a0c2b..5f8c9f49d65 100644
--- 
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 class PulsarAdminToolTest {
         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