[pulsar] branch branch-3.0 updated: [fix][broker] Fix ledger cachemiss size metric (#20257)

[yubiao]

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

yubiao pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new 698529b69ee [fix][broker] Fix ledger cachemiss size metric (#20257)
698529b69ee is described below

commit 698529b69eed0fea319341bcf19430115db41577
Author: houxiaoyu <houxia...@apache.org>
AuthorDate: Mon May 29 10:20:08 2023 +0800

    [fix][broker] Fix ledger cachemiss size metric (#20257)
    
    (cherry picked from commit 1c813fdaeb9f752b84347b5a62e219dd66e79a26)
---
 .../org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java    | 4 ++--
 .../org/apache/bookkeeper/mledger/impl/cache/EntryCacheDisabled.java  | 4 ++--
 .../org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheImpl.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java
 
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java
index cb3d72cc597..e057dee9953 100644
--- 
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java
+++ 
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java
@@ -100,8 +100,8 @@ public class ManagedLedgerMBeanImpl implements 
ManagedLedgerMXBean {
         readEntriesOpsFailed.recordEvent();
     }
 
-    public void recordReadEntriesOpsCacheMisses() {
-        readEntriesOpsCacheMisses.recordEvent();
+    public void recordReadEntriesOpsCacheMisses(int count, long totalSize) {
+        readEntriesOpsCacheMisses.recordMultipleEvents(count, totalSize);
     }
 
     public void addAddEntryLatencySample(long latency, TimeUnit unit) {
diff --git 
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDisabled.java
 
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDisabled.java
index d2add99b701..d1050e00628 100644
--- 
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDisabled.java
+++ 
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/EntryCacheDisabled.java
@@ -93,7 +93,7 @@ public class EntryCacheDisabled implements EntryCache {
                     } finally {
                         ledgerEntries.close();
                     }
-                    ml.getMbean().recordReadEntriesOpsCacheMisses();
+                    
ml.getMbean().recordReadEntriesOpsCacheMisses(entries.size(), totalSize);
                     ml.getFactory().getMbean().recordCacheMiss(entries.size(), 
totalSize);
                     ml.getMbean().addReadEntriesSample(entries.size(), 
totalSize);
 
@@ -121,7 +121,7 @@ public class EntryCacheDisabled implements EntryCache {
                             LedgerEntry ledgerEntry = iterator.next();
                             EntryImpl returnEntry = 
RangeEntryCacheManagerImpl.create(ledgerEntry, interceptor);
 
-                            ml.getMbean().recordReadEntriesOpsCacheMisses();
+                            ml.getMbean().recordReadEntriesOpsCacheMisses(1, 
returnEntry.getLength());
                             ml.getFactory().getMbean().recordCacheMiss(1, 
returnEntry.getLength());
                             ml.getMbean().addReadEntriesSample(1, 
returnEntry.getLength());
                             callback.readEntryComplete(returnEntry, ctx);
diff --git 
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheImpl.java
 
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheImpl.java
index 7747f9bcd93..27aec6f178e 100644
--- 
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheImpl.java
+++ 
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/cache/RangeEntryCacheImpl.java
@@ -256,7 +256,7 @@ public class RangeEntryCacheImpl implements EntryCache {
                                 LedgerEntry ledgerEntry = iterator.next();
                                 EntryImpl returnEntry = 
RangeEntryCacheManagerImpl.create(ledgerEntry, interceptor);
 
-                                
ml.getMbean().recordReadEntriesOpsCacheMisses();
+                                
ml.getMbean().recordReadEntriesOpsCacheMisses(1, returnEntry.getLength());
                                 manager.mlFactoryMBean.recordCacheMiss(1, 
returnEntry.getLength());
                                 ml.getMbean().addReadEntriesSample(1, 
returnEntry.getLength());
                                 callback.readEntryComplete(returnEntry, ctx);
@@ -450,7 +450,7 @@ public class RangeEntryCacheImpl implements EntryCache {
                                     }
                                 }
 
-                                
ml.getMbean().recordReadEntriesOpsCacheMisses();
+                                
ml.getMbean().recordReadEntriesOpsCacheMisses(entriesToReturn.size(), 
totalSize);
                                 
manager.mlFactoryMBean.recordCacheMiss(entriesToReturn.size(), totalSize);
                                 
ml.getMbean().addReadEntriesSample(entriesToReturn.size(), totalSize);