Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix][broker] Fix seeking by timestamp can be reset the cursor position to earliest #23919

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+5 −20
Open

[fix][broker] Fix seeking by timestamp can be reset the cursor position to earliest #23919

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abb6e81
Fix https://github.com/apache/pulsar/issues/23910
dao-jun Feb 2, 2025
ef8ecd4
fix checkstyle & tests
dao-jun Feb 4, 2025
10ae74e
fix checkstyle & tests
dao-jun Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ public void asyncFindNewestMatching(FindPositionConstraint constraint, Predicate
}

if (max <= 0) {
callback.findEntryComplete(null, ctx);
callback.findEntryFailed(new ManagedLedgerException("No entries available"), Optional.empty(), ctx);
return;
}

Expand Down
20 changes: 3 additions & 17 deletions ...er/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import static com.google.common.base.Preconditions.checkArgument;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;

import com.google.common.annotations.VisibleForTesting;
import org.apache.bookkeeper.mledger.AsyncCallbacks;
import org.apache.bookkeeper.mledger.ManagedCursor;
import org.apache.bookkeeper.mledger.ManagedLedgerException;
Expand Down Expand Up @@ -91,6 +93,7 @@ public void findMessages(final long timestamp, AsyncCallbacks.FindEntryCallback
}
}

@VisibleForTesting
public static Pair<Position, Position> getFindPositionRange(Iterable<LedgerInfo> ledgerInfos,
Position lastConfirmedEntry, long targetTimestamp,
int ledgerCloseTimestampMaxClockSkewMillis) {
Expand All @@ -105,15 +108,11 @@ public static Pair<Position, Position> getFindPositionRange(Iterable<LedgerInfo>
Position start = null;
Position end = null;

LedgerInfo secondToLastLedgerInfo = null;
LedgerInfo lastLedgerInfo = null;
for (LedgerInfo info : ledgerInfos) {
if (!info.hasTimestamp()) {
// unexpected case, don't set start and end
return Pair.of(null, null);
}
secondToLastLedgerInfo = lastLedgerInfo;
lastLedgerInfo = info;
long closeTimestamp = info.getTimestamp();
// For an open ledger, closeTimestamp is 0
if (closeTimestamp == 0) {
Expand All @@ -128,19 +127,6 @@ public static Pair<Position, Position> getFindPositionRange(Iterable<LedgerInfo>
break;
}
}
// If the second-to-last ledger's close timestamp is less than the target timestamp, then start from the
// first entry of the last ledger when there are confirmed entries in the ledger
if (lastLedgerInfo != null && secondToLastLedgerInfo != null
&& secondToLastLedgerInfo.getTimestamp() > 0
&& secondToLastLedgerInfo.getTimestamp() < targetTimestampMin) {
Position firstPositionInLedger = PositionFactory.create(lastLedgerInfo.getLedgerId(), 0);
if (lastConfirmedEntry != null
&& lastConfirmedEntry.compareTo(firstPositionInLedger) >= 0) {
start = firstPositionInLedger;
} else {
start = lastConfirmedEntry;
}
}
return Pair.of(start, end);
}

Expand Down
Loading