[pulsar] branch branch-2.10 updated: [fix][broker]Cache invalidation due to concurrent access (#18076)

[xi...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-2.10 by this push:
     new 224cd358de9 [fix][broker]Cache invalidation due to concurrent access (#18076)
224cd358de9 is described below

commit 224cd358de9a624fdb4feb5e95d44ae8547a898a
Author: fengyubiao <yu...@streamnative.io>
AuthorDate: Wed Oct 19 16:51:27 2022 +0800

    [fix][broker]Cache invalidation due to concurrent access (#18076)
    
    (cherry picked from commit 7e5cad778907f3a0095343492cbf07ca202976b4)
---
 .../main/java/org/apache/bookkeeper/mledger/util/RangeCache.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/RangeCache.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/RangeCache.java
index 1de9429d7c0..d581c708d9a 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/RangeCache.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/util/RangeCache.java
@@ -191,13 +191,12 @@ public class RangeCache<Key extends Comparable<Key>, Value extends ReferenceCoun
            if (entry == null || timestampExtractor.getTimestamp(entry.getValue()) > maxTimestamp) {
                break;
            }
-
-           entry = entries.pollFirstEntry();
-           if (entry == null) {
+           Value value = entry.getValue();
+           boolean removeHits = entries.remove(entry.getKey(), value);
+           if (!removeHits) {
                break;
            }
 
-           Value value = entry.getValue();
            removedSize += weighter.getSize(value);
            value.release();
        }