diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java index 7b3bf744a82edd..110d912385e489 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java @@ -22,7 +22,6 @@ import io.netty.util.Timer; import io.netty.util.TimerTask; import java.time.Clock; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.TransactionMetadataStoreService; @@ -57,10 +56,10 @@ public class TransactionTimeoutTrackerImpl implements TransactionTimeoutTracker, } @Override - public CompletableFuture addTransaction(long sequenceId, long timeout) { + public void addTransaction(long sequenceId, long timeout) { if (timeout < tickTimeMillis) { this.transactionMetadataStoreService.endTransactionForTimeout(new TxnID(tcId, sequenceId)); - return CompletableFuture.completedFuture(false); + return; } synchronized (this){ long nowTime = clock.millis(); @@ -79,7 +78,6 @@ public CompletableFuture addTransaction(long sequenceId, long timeout) nowTaskTimeoutTime = transactionTimeoutTime; } } - return CompletableFuture.completedFuture(false); } @Override diff --git a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java index 5e84b002f33169..a681c4bad3e583 100644 --- a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java +++ b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java @@ -19,7 +19,6 @@ package org.apache.pulsar.transaction.coordinator; import com.google.common.annotations.Beta; -import java.util.concurrent.CompletableFuture; /** * Represent the tracker for the timeout of the transaction. @@ -34,10 +33,8 @@ public interface TransactionTimeoutTracker extends AutoCloseable { * the sequenceId * @param timeout * the absolute timestamp for transaction timeout - * - * @return true if the transaction was added to the tracker or false if had timed out */ - CompletableFuture addTransaction(long sequenceId, long timeout); + void addTransaction(long sequenceId, long timeout); /** * When replay the log, add the txnMeta to timer task queue. diff --git a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java index 1e10db9753a9c9..6ee7b3bb12883f 100644 --- a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java +++ b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java @@ -524,8 +524,7 @@ public void testManageLedgerWriteFailState(TxnLogBufferedWriterConfig txnLogBuff public class TransactionTimeoutTrackerImpl implements TransactionTimeoutTracker { @Override - public CompletableFuture addTransaction(long sequenceId, long timeout) { - return null; + public void addTransaction(long sequenceId, long timeout) { } @Override