merlimat closed pull request #1478: Fix race condition in skipEntries that
moves readPosition and markDeletePosition incorrectly
URL: https://github.com/apache/incubator-pulsar/pull/1478
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 9b3d9cd7a..29fe0a724 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
@@ -1245,18 +1245,6 @@ PositionImpl setAcknowledgedPosition(PositionImpl
newMarkDeletePosition) {
throw new IllegalArgumentException("Mark deleting an already
mark-deleted position");
}
- if (readPosition.compareTo(newMarkDeletePosition) <= 0) {
- // If the position that is mark-deleted is past the read position,
it
- // means that the client has skipped some entries. We need to move
- // read position forward
- PositionImpl oldReadPosition = readPosition;
- readPosition = ledger.getNextValidPosition(newMarkDeletePosition);
-
- if (log.isDebugEnabled()) {
- log.debug("[{}] Moved read position from: {} to: {}",
ledger.getName(), oldReadPosition, readPosition);
- }
- }
-
PositionImpl oldMarkDeletePosition = markDeletePosition;
if (!newMarkDeletePosition.equals(oldMarkDeletePosition)) {
@@ -1285,6 +1273,19 @@ PositionImpl setAcknowledgedPosition(PositionImpl
newMarkDeletePosition) {
// markDelete-position and clear out deletedMsgSet
markDeletePosition = PositionImpl.get(newMarkDeletePosition);
individualDeletedMessages.remove(Range.atMost(markDeletePosition));
+
+ if (readPosition.compareTo(newMarkDeletePosition) <= 0) {
+ // If the position that is mark-deleted is past the read position,
it
+ // means that the client has skipped some entries. We need to move
+ // read position forward
+ PositionImpl oldReadPosition = readPosition;
+ readPosition = ledger.getNextValidPosition(newMarkDeletePosition);
+
+ if (log.isDebugEnabled()) {
+ log.debug("[{}] Moved read position from: {} to: {}, and new
mark-delete position {}", ledger.getName(),
+ oldReadPosition, readPosition, markDeletePosition);
+ }
+ }
return newMarkDeletePosition;
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
