Skip to content

[fix][test] Fix Mockito stubbing race in TopicListServiceTest #25227

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

Open
Denovo1998 wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −12
Open

[fix][test] Fix Mockito stubbing race in TopicListServiceTest #25227

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
26 changes: 14 additions & 12 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicListServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,20 @@ public void testCommandWatchUpdate() {

@Test
public void testCommandWatchUpdateRetries() {
AtomicInteger failureCount = new AtomicInteger(0);
// Set up the stubbing before starting async work to avoid races with Mockito stubbing state.
doAnswer(invocationOnMock -> {
List<String> newTopicsArg = invocationOnMock.getArgument(1);
if (!newTopicsArg.isEmpty() && failureCount.incrementAndGet() < 3) {
Throwable failure = new AsyncSemaphore.PermitAcquireTimeoutException("Acquire timed out");
Function<Throwable, CompletableFuture<Void>> permitAcquireErrorHandler =
invocationOnMock.getArgument(4);
return permitAcquireErrorHandler.apply(failure);
} else {
return CompletableFuture.completedFuture(null);
}
}).when(pulsarCommandSender).sendWatchTopicListUpdate(anyLong(), any(), any(), anyString(), any());

topicListService.handleWatchTopicList(
NamespaceName.get("tenant/ns"),
13,
Expand All @@ -349,18 +363,6 @@ public void testCommandWatchUpdateRetries() {

List<String> newTopics = Collections.singletonList("persistent://tenant/ns/topic2");
String hash = TopicList.calculateHash(ListUtils.union(topics, newTopics));
AtomicInteger failureCount = new AtomicInteger(0);
doAnswer(invocationOnMock -> {
List<String> newTopicsArg = invocationOnMock.getArgument(1);
if (!newTopicsArg.isEmpty() && failureCount.incrementAndGet() < 3) {
Throwable failure = new AsyncSemaphore.PermitAcquireTimeoutException("Acquire timed out");
Function<Throwable, CompletableFuture<Void>> permitAcquireErrorHandler =
invocationOnMock.getArgument(4);
return permitAcquireErrorHandler.apply(failure);
} else {
return CompletableFuture.completedFuture(null);
}
}).when(pulsarCommandSender).sendWatchTopicListUpdate(anyLong(), any(), any(), anyString(), any());
notificationConsumer.accept(
new Notification(NotificationType.Created, "/managed-ledgers/tenant/ns/persistent/topic2"));
notificationConsumer.accept(
Expand Down