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] [ml] fix key_shared mode delivery are order out order after a consumers reconnection #23803

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[fix] [ml] fix key_shared mode delivery are order out order after a consumers reconnection #23803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c44e8f3
[fix] [ml] fix key_shared mode delivery are order out order after a c…
poorbarcode Jan 2, 2025
d673504
fix for 4.0
poorbarcode Jan 3, 2025
8e0947d
add tests
poorbarcode Jan 23, 2025
3cbf13d
fix issue
poorbarcode Jan 23, 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
26 changes: 18 additions & 8 deletions ...va/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ public class PersistentDispatcherMultipleConsumers extends AbstractPersistentDis
protected volatile boolean havePendingRead = false;
protected volatile boolean havePendingReplayRead = false;
protected volatile Position minReplayedPosition = null;
protected boolean shouldRewindBeforeReadingOrReplaying = false;
protected boolean shouldRewindBeforeReading = false;
protected boolean shouldSkipNextReplaying = false;
protected final String name;
private boolean sendInProgress = false;
protected static final AtomicIntegerFieldUpdater<PersistentDispatcherMultipleConsumers>
Expand Down Expand Up @@ -185,12 +186,15 @@ public synchronized CompletableFuture<Void> addConsumer(Consumer consumer) {
return CompletableFuture.completedFuture(null);
}
if (consumerList.isEmpty()) {
if (havePendingRead || havePendingReplayRead) {
if (havePendingReplayRead) {
shouldSkipNextReplaying = true;
}
if (havePendingRead) {
// There is a pending read from previous run. We must wait for it to complete and then rewind
shouldRewindBeforeReadingOrReplaying = true;
shouldRewindBeforeReading = true;
} else {
cursor.rewind();
shouldRewindBeforeReadingOrReplaying = false;
shouldRewindBeforeReading = false;
}
redeliveryMessages.clear();
delayedDeliveryTracker.ifPresent(tracker -> {
Expand Down Expand Up @@ -720,6 +724,10 @@ public final synchronized void readEntriesComplete(List<Entry> entries, Object c
havePendingRead = false;
} else {
havePendingReplayRead = false;
if (shouldSkipNextReplaying && readType == ReadType.Replay) {
shouldSkipNextReplaying = false;
return;
}
}

if (readBatchSize < serviceConfig.getDispatcherMaxReadBatchSize()) {
Expand All @@ -733,11 +741,11 @@ public final synchronized void readEntriesComplete(List<Entry> entries, Object c

readFailureBackoff.reduceToHalf();

if (shouldRewindBeforeReadingOrReplaying && readType == ReadType.Normal) {
if (shouldRewindBeforeReading && readType == ReadType.Normal) {
// All consumers got disconnected before the completion of the read operation
entries.forEach(Entry::release);
cursor.rewind();
shouldRewindBeforeReadingOrReplaying = false;
shouldRewindBeforeReading = false;
readMoreEntriesAsync();
return;
}
Expand Down Expand Up @@ -1061,8 +1069,10 @@ public synchronized void readEntriesFailed(ManagedLedgerException exception, Obj
}
}

if (shouldRewindBeforeReadingOrReplaying) {
shouldRewindBeforeReadingOrReplaying = false;
if (shouldSkipNextReplaying && readType == ReadType.Replay) {
shouldSkipNextReplaying = false;
} else if (shouldRewindBeforeReading && readType == ReadType.Normal) {
shouldRewindBeforeReading = false;
cursor.rewind();
}

Expand Down
27 changes: 19 additions & 8 deletions ...apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumersClassic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ public class PersistentDispatcherMultipleConsumersClassic extends AbstractPersis
protected volatile boolean havePendingRead = false;
protected volatile boolean havePendingReplayRead = false;
protected volatile Position minReplayedPosition = null;
protected boolean shouldRewindBeforeReadingOrReplaying = false;
protected boolean shouldRewindBeforeReading = false;
protected boolean shouldSkipNextReplaying = false;
protected final String name;
private boolean sendInProgress = false;
protected static final AtomicIntegerFieldUpdater<PersistentDispatcherMultipleConsumersClassic>
Expand Down Expand Up @@ -173,12 +174,15 @@ public synchronized CompletableFuture<Void> addConsumer(Consumer consumer) {
return CompletableFuture.completedFuture(null);
}
if (consumerList.isEmpty()) {
if (havePendingRead || havePendingReplayRead) {
if (havePendingReplayRead) {
shouldSkipNextReplaying = true;
}
if (havePendingRead) {
// There is a pending read from previous run. We must wait for it to complete and then rewind
shouldRewindBeforeReadingOrReplaying = true;
shouldRewindBeforeReading = true;
} else {
cursor.rewind();
shouldRewindBeforeReadingOrReplaying = false;
shouldRewindBeforeReading = false;
}
redeliveryMessages.clear();
delayedDeliveryTracker.ifPresent(tracker -> {
Expand Down Expand Up @@ -633,6 +637,11 @@ public final synchronized void readEntriesComplete(List<Entry> entries, Object c
havePendingRead = false;
} else {
havePendingReplayRead = false;
if (shouldSkipNextReplaying && readType == ReadType.Replay) {
shouldSkipNextReplaying = false;
readMoreEntriesAsync();
return;
}
}

if (readBatchSize < serviceConfig.getDispatcherMaxReadBatchSize()) {
Expand All @@ -646,11 +655,11 @@ public final synchronized void readEntriesComplete(List<Entry> entries, Object c

readFailureBackoff.reduceToHalf();

if (shouldRewindBeforeReadingOrReplaying && readType == ReadType.Normal) {
if (shouldRewindBeforeReading && readType == ReadType.Normal) {
// All consumers got disconnected before the completion of the read operation
entries.forEach(Entry::release);
cursor.rewind();
shouldRewindBeforeReadingOrReplaying = false;
shouldRewindBeforeReading = false;
readMoreEntries();
return;
}
Expand Down Expand Up @@ -931,8 +940,10 @@ public synchronized void readEntriesFailed(ManagedLedgerException exception, Obj
}
}

if (shouldRewindBeforeReadingOrReplaying) {
shouldRewindBeforeReadingOrReplaying = false;
if (shouldSkipNextReplaying && readType == ReadType.Replay) {
shouldSkipNextReplaying = false;
} else if (shouldRewindBeforeReading && readType == ReadType.Normal) {
shouldRewindBeforeReading = false;
cursor.rewind();
}

Expand Down
2 changes: 1 addition & 1 deletion ...lsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumersClassic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public synchronized CompletableFuture<Void> addConsumer(Consumer consumer) {
// If there is a delayed "cursor.rewind" after the pending read, the consumers that will be
// added before the "cursor.rewind" will have a same "recent joined position", which is the
// same as "mark deleted position +1", so we can skip this adding.
&& !shouldRewindBeforeReadingOrReplaying) {
&& !shouldRewindBeforeReading) {
recentlyJoinedConsumers.put(consumer, readPositionWhenJoining);
sortRecentlyJoinedConsumersIfNeeded();
}
Expand Down
Loading
Loading