Skip to content

[fix][broker] Fix compaction horizon might be reset to an old position when phase two is interrupted #25119

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

Merged
BewareMyPower merged 3 commits into from
Jan 4, 2026
+150 −49
Merged

[fix][broker] Fix compaction horizon might be reset to an old position when phase two is interrupted #25119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
548e2a0
[fix][broker] Fix compaction horizon might be reset to an old positio…
BewareMyPower Dec 29, 2025
dbc9a0b
address comments
BewareMyPower Dec 30, 2025
87906cd
fix StrategicCompactionTest
BewareMyPower Jan 4, 2026
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
8 changes: 6 additions & 2 deletions 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 @@ -1503,7 +1503,12 @@ protected void internalResetCursor(Position proposedReadPosition,

final AsyncCallbacks.ResetCursorCallback callback = resetCursorCallback;

final Position newMarkDeletePosition = ledger.getPreviousPosition(newReadPosition);
final Position newMarkDeletePosition;
if (isCompactionCursor()) {
newMarkDeletePosition = markDeletePosition;
} else {
newMarkDeletePosition = ledger.getPreviousPosition(newReadPosition);
}

Runnable alignAcknowledgeStatusAfterPersisted = () -> {
// Correct the variable "messagesConsumedCounter".
Expand Down Expand Up @@ -1593,7 +1598,6 @@ public void operationFailed(ManagedLedgerException exception) {

persistentMarkDeletePosition = null;
inProgressMarkDeletePersistPosition = null;
lastMarkDeleteEntry = new MarkDeleteEntry(newMarkDeletePosition, getProperties(), null, null);
internalAsyncMarkDelete(newMarkDeletePosition, isCompactionCursor() ? getProperties() : Collections.emptyMap(),
new MarkDeleteCallback() {
@Override
Expand Down
6 changes: 5 additions & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/compaction/AbstractTwoPhaseCompactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.apache.pulsar.compaction;

import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
import java.time.Duration;
Expand Down Expand Up @@ -59,6 +60,8 @@
*/
public abstract class AbstractTwoPhaseCompactor<T> extends Compactor {

@VisibleForTesting
static Runnable injectionAfterSeekInPhaseTwo = () -> {};
private static final Logger log = LoggerFactory.getLogger(AbstractTwoPhaseCompactor.class);
protected static final int MAX_OUTSTANDING = 500;
protected final Duration phaseOneLoopReadTimeout;
Expand Down Expand Up @@ -188,6 +191,7 @@ private CompletableFuture<Long> phaseTwoSeekThenLoop(RawReader reader, MessageId
CompletableFuture<Long> promise = new CompletableFuture<>();

reader.seekAsync(from).thenCompose((v) -> {
injectionAfterSeekInPhaseTwo.run();
Semaphore outstanding = new Semaphore(MAX_OUTSTANDING);
CompletableFuture<Void> loopPromise = new CompletableFuture<>();
phaseTwoLoop(reader, to, latestForKey, ledger, outstanding, loopPromise, MessageId.earliest);
Expand Down Expand Up @@ -436,4 +440,4 @@ protected static class PhaseOneResult<T> {
public long getPhaseOneLoopReadTimeoutInSeconds() {
return phaseOneLoopReadTimeout.getSeconds();
}
}
}
Loading
Loading