Skip to content

[fix][broker] Flaky-test: TopicTransactionBufferTest.testMessagePublishInOrder #24826

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
merged 2 commits into from
Oct 22, 2025
+6 −17
Merged

[fix][broker] Flaky-test: TopicTransactionBufferTest.testMessagePublishInOrder #24826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f571cc6
[fix][broker] Flaky-test: TopicTransactionBufferTest.testMessagePubli…
Dream95 Oct 7, 2025
c3bbca1
Merge branch 'master' into fix-flaky-test-24788
lhotari Oct 17, 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
7 changes: 6 additions & 1 deletion ...rc/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,11 @@ public CompletableFuture<TransactionMeta> getTransactionMeta(TxnID txnID) {
return CompletableFuture.completedFuture(null);
}

@VisibleForTesting
public void setPublishFuture(CompletableFuture<Position> publishFuture) {
this.publishFuture = publishFuture;
}

@VisibleForTesting
public CompletableFuture<Position> getPublishFuture() {
return publishFuture;
Expand Down Expand Up @@ -298,7 +303,7 @@ public CompletableFuture<Position> appendBufferToTxn(TxnID txnId, long sequenceI
"Transaction Buffer recover failed, the current state is: " + getState()));
}
}).whenComplete(((position, throwable) -> buffer.release()));
publishFuture = future;
setPublishFuture(future);
return future;
}

Expand Down
16 changes: 0 additions & 16 deletions ...est/java/org/apache/pulsar/broker/transaction/buffer/utils/TransactionBufferTestImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,20 @@
*/
package org.apache.pulsar.broker.transaction.buffer.utils;

import java.util.concurrent.CompletableFuture;
import lombok.Setter;
import org.apache.bookkeeper.mledger.Position;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
import org.apache.pulsar.broker.transaction.buffer.impl.TopicTransactionBuffer;

public class TransactionBufferTestImpl extends TopicTransactionBuffer {
@Setter
public CompletableFuture<Void> transactionBufferFuture = null;
@Setter
public State state = null;
@Setter
public CompletableFuture<Position> publishFuture = null;

public TransactionBufferTestImpl(PersistentTopic topic) {
super(topic);
}

@Override
public CompletableFuture<Void> getTransactionBufferFuture() {
return transactionBufferFuture == null ? super.getTransactionBufferFuture() : transactionBufferFuture;
}

@Override
public State getState() {
return state == null ? super.getState() : state;
}

@Override
public CompletableFuture<Position> getPublishFuture() {
return publishFuture == null ? super.getPublishFuture() : publishFuture;
}
}
Loading