(pulsar) branch master updated: [fix][broker] Flaky-test: TopicTransactionBufferTest.testMessagePublishInOrder (#24826)

[technoboy]

This is an automated email from the ASF dual-hosted git repository.

technoboy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 88287345d32 [fix][broker] Flaky-test: 
TopicTransactionBufferTest.testMessagePublishInOrder (#24826)
88287345d32 is described below

commit 88287345d3246fe0d6ea34e06389356ada516cfa
Author: Dream95 <864197...@qq.com>
AuthorDate: Wed Oct 22 12:58:17 2025 +0800

    [fix][broker] Flaky-test: 
TopicTransactionBufferTest.testMessagePublishInOrder (#24826)
    
    Signed-off-by: Dream95 <zhou_8...@163.com>
    Co-authored-by: Lari Hotari <lhot...@users.noreply.github.com>
---
 .../transaction/buffer/impl/TopicTransactionBuffer.java  |  7 ++++++-
 .../buffer/utils/TransactionBufferTestImpl.java          | 16 ----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java
index c3961dca6d4..0c777afaa26 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java
@@ -232,6 +232,11 @@ public class TopicTransactionBuffer extends 
TopicTransactionBufferState implemen
         return CompletableFuture.completedFuture(null);
     }
 
+    @VisibleForTesting
+    public void setPublishFuture(CompletableFuture<Position> publishFuture) {
+        this.publishFuture = publishFuture;
+    }
+
     @VisibleForTesting
     public CompletableFuture<Position> getPublishFuture() {
         return publishFuture;
@@ -298,7 +303,7 @@ public class TopicTransactionBuffer extends 
TopicTransactionBufferState implemen
                         "Transaction Buffer recover failed, the current state 
is: " + getState()));
             }
         }).whenComplete(((position, throwable) -> buffer.release()));
-        publishFuture = future;
+        setPublishFuture(future);
         return future;
     }
 
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/utils/TransactionBufferTestImpl.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/utils/TransactionBufferTestImpl.java
index 18724e13f67..b1168d08501 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/utils/TransactionBufferTestImpl.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/utils/TransactionBufferTestImpl.java
@@ -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;
-    }
 }