Skip to content

[fix][test] Fix flaky ReplicatorTest.testReplicatorClearBacklog NPE on inFlightTask #25691

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
merlimat merged 1 commit into from
May 6, 2026
+12 −2
Merged

[fix][test] Fix flaky ReplicatorTest.testReplicatorClearBacklog NPE on inFlightTask #25691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static org.apache.pulsar.broker.BrokerTestUtil.newUniqueName;
import static org.apache.pulsar.broker.service.persistent.BrokerServicePersistInternalMethodInvoker.ensureNoBacklogByInflightTask;
import static org.apache.pulsar.broker.service.persistent.BrokerServicePersistInternalMethodInvoker.newInFlightTaskCtx;
import static org.apache.pulsar.broker.stats.BrokerOpenTelemetryTestUtil.assertMetricDoubleGaugeValue;
import static org.apache.pulsar.broker.stats.BrokerOpenTelemetryTestUtil.assertMetricLongSumValue;
import static org.mockito.ArgumentMatchers.eq;
Expand Down Expand Up @@ -663,7 +664,9 @@ public void testReplicatorClearBacklog() throws Exception {
PersistentTopic topic = (PersistentTopic) pulsar1.getBrokerService().getTopicReference(dest.toString()).get();
PersistentReplicator replicator = (PersistentReplicator) spy(
topic.getReplicators().get(topic.getReplicators().keySet().stream().toList().get(0)));
replicator.readEntriesFailed(new ManagedLedgerException.InvalidCursorPositionException("failed"), null);
Object inFlightTaskCtx = newInFlightTaskCtx(replicator, PositionFactory.create(1, 1), 1);
replicator.readEntriesFailed(new ManagedLedgerException.InvalidCursorPositionException("failed"),
inFlightTaskCtx);
replicator.clearBacklog().get();
Thread.sleep(100);
replicator.updateRates(); // for code-coverage
Expand Down Expand Up @@ -693,7 +696,9 @@ public void testReplicatorExpireMsgAsync() throws Exception {
PersistentTopic topic = (PersistentTopic) pulsar1.getBrokerService().getTopicReference(dest.toString()).get();
PersistentReplicator replicator = (PersistentReplicator) spy(
topic.getReplicators().get(topic.getReplicators().keySet().stream().toList().get(0)));
replicator.readEntriesFailed(new ManagedLedgerException.InvalidCursorPositionException("failed"), null);
Object inFlightTaskCtx = newInFlightTaskCtx(replicator, PositionFactory.create(1, 1), 1);
replicator.readEntriesFailed(new ManagedLedgerException.InvalidCursorPositionException("failed"),
inFlightTaskCtx);
replicator.clearBacklog().get();
Thread.sleep(100);
replicator.updateRates(); // for code-coverage
Expand Down
5 changes: 5 additions & 0 deletions ...rg/apache/pulsar/broker/service/persistent/BrokerServicePersistInternalMethodInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.pulsar.broker.service.persistent;

import java.util.concurrent.TimeUnit;
import org.apache.bookkeeper.mledger.Position;
import org.awaitility.Awaitility;

public class BrokerServicePersistInternalMethodInvoker {
Expand All @@ -42,4 +43,8 @@ public static void ensureNoBacklogByInflightTask(PersistentReplicator replicator
return true;
});
}

public static Object newInFlightTaskCtx(PersistentReplicator replicator, Position readPos, int readingEntries) {
return new PersistentReplicator.InFlightTask(readPos, readingEntries, replicator.getReplicatorId());
}
}
Loading