You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2018/11/20 07:04:52 UTC
[pulsar] branch master updated: Prevent race condition while
calculating unack-msg offset stats (#3015)
This is an automated email from the ASF dual-hosted git repository.
mmerli 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 5fde6f3 Prevent race condition while calculating unack-msg offset stats (#3015)
5fde6f3 is described below
commit 5fde6f32b038327163ebf7babc556b72f337a1a1
Author: Rajan Dhabalia <rd...@apache.org>
AuthorDate: Mon Nov 19 23:04:48 2018 -0800
Prevent race condition while calculating unack-msg offset stats (#3015)
* Prevent race condition while calculating unack-msg offset stats
* local var
---
.../org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
index 6c7e15c..4085f80 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
@@ -665,7 +665,13 @@ public class ManagedCursorImpl implements ManagedCursor {
@Override
public long getNumberOfEntriesSinceFirstNotAckedMessage() {
- return ledger.getNumberOfEntries(Range.openClosed(markDeletePosition, readPosition));
+ // sometimes for already caught up consumer: due to race condition markDeletePosition > readPosition. so,
+ // validate it before preparing range
+ PositionImpl markDeletePosition = this.markDeletePosition;
+ PositionImpl readPosition = this.readPosition;
+ return (markDeletePosition.compareTo(readPosition) < 0)
+ ? ledger.getNumberOfEntries(Range.openClosed(markDeletePosition, readPosition))
+ : 0;
}
@Override