Skip to content

Commit aa94554

Browse files
committed
fix: Race condition in testNonBlockingWithMultipleMessages
1 parent b103c8a commit aa94554

5 files changed

Lines changed: 91 additions & 0 deletions

File tree

‎reference/grpc/src/test/java/io/a2a/server/grpc/quarkus/A2ATestResource.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,20 @@ public Response savePushNotificationConfigInStore(@PathParam("taskId") String ta
137137
testUtilsBean.saveTaskPushNotificationConfig(taskId, notificationConfig);
138138
return Response.ok().build();
139139
}
140+
141+
@POST
142+
@Path("/queue/awaitPollerStart/{taskId}")
143+
public Response awaitQueuePollerStart(@PathParam("taskId") String taskId) throws InterruptedException {
144+
testUtilsBean.awaitQueuePollerStart(taskId);
145+
return Response.ok().build();
146+
}
147+
148+
@POST
149+
@Path("/queue/awaitChildCountStable/{taskId}/{expectedCount}/{timeoutMs}")
150+
public Response awaitChildQueueCountStable(@PathParam("taskId") String taskId,
151+
@PathParam("expectedCount") int expectedCount,
152+
@PathParam("timeoutMs") long timeoutMs) throws InterruptedException {
153+
boolean stable = testUtilsBean.awaitChildQueueCountStable(taskId, expectedCount, timeoutMs);
154+
return Response.ok(String.valueOf(stable), TEXT_PLAIN).build();
155+
}
140156
}

‎reference/jsonrpc/src/test/java/io/a2a/server/apps/quarkus/A2ATestRoutes.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,20 @@ public void saveTaskPushNotificationConfig(@Param String taskId, @Body String bo
185185
}
186186
}
187187

188+
@Route(path = "/test/queue/awaitChildCountStable/:taskId/:expectedCount/:timeoutMs", methods = {Route.HttpMethod.POST}, type = Route.HandlerType.BLOCKING)
189+
public void awaitChildQueueCountStable(@Param("taskId") String taskId, @Param("expectedCount") String expectedCountStr, @Param("timeoutMs") String timeoutMsStr, RoutingContext rc) {
190+
try {
191+
int expectedCount = Integer.parseInt(expectedCountStr);
192+
long timeoutMs = Long.parseLong(timeoutMsStr);
193+
boolean stable = testUtilsBean.awaitChildQueueCountStable(taskId, expectedCount, timeoutMs);
194+
rc.response()
195+
.setStatusCode(200)
196+
.end(String.valueOf(stable));
197+
} catch (Throwable t) {
198+
errorResponse(t, rc);
199+
}
200+
}
201+
188202
private void errorResponse(Throwable t, RoutingContext rc) {
189203
t.printStackTrace();
190204
rc.response()

‎reference/rest/src/test/java/io/a2a/server/rest/quarkus/A2ATestRoutes.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,20 @@ public void saveTaskPushNotificationConfig(@Param String taskId, @Body String bo
185185
}
186186
}
187187

188+
@Route(path = "/test/queue/awaitChildCountStable/:taskId/:expectedCount/:timeoutMs", methods = {Route.HttpMethod.POST}, type = Route.HandlerType.BLOCKING)
189+
public void awaitChildQueueCountStable(@Param("taskId") String taskId, @Param("expectedCount") String expectedCountStr, @Param("timeoutMs") String timeoutMsStr, RoutingContext rc) {
190+
try {
191+
int expectedCount = Integer.parseInt(expectedCountStr);
192+
long timeoutMs = Long.parseLong(timeoutMsStr);
193+
boolean stable = testUtilsBean.awaitChildQueueCountStable(taskId, expectedCount, timeoutMs);
194+
rc.response()
195+
.setStatusCode(200)
196+
.end(String.valueOf(stable));
197+
} catch (Throwable t) {
198+
errorResponse(t, rc);
199+
}
200+
}
201+
188202
private void errorResponse(Throwable t, RoutingContext rc) {
189203
t.printStackTrace();
190204
rc.response()

‎tests/server-common/src/test/java/io/a2a/server/apps/common/AbstractA2AServerTest.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,6 +1401,11 @@ public void testNonBlockingWithMultipleMessages() throws Exception {
14011401

14021402
assertTrue(subscriptionLatch.await(15, TimeUnit.SECONDS));
14031403

1404+
// CRITICAL: Wait for subscribeToTask's child queue poller to start
1405+
// This ensures it's ready to receive events from the upcoming sendMessage
1406+
assertTrue(awaitChildQueueCountStable(taskId, 1, 5000),
1407+
"subscribeToTask child queue should be created and stable");
1408+
14041409
// 3. Send second streaming message to same taskId
14051410
Message message2 = Message.builder(MESSAGE)
14061411
.taskId(multiEventTaskId) // Same taskId
@@ -1492,6 +1497,23 @@ public void testNonBlockingWithMultipleMessages() throws Exception {
14921497
}
14931498
}
14941499

1500+
private boolean awaitChildQueueCountStable(String taskId, int expectedCount, long timeoutMs) throws IOException, InterruptedException {
1501+
HttpClient client = HttpClient.newBuilder()
1502+
.version(HttpClient.Version.HTTP_2)
1503+
.build();
1504+
HttpRequest request = HttpRequest.newBuilder()
1505+
.uri(URI.create("http://localhost:" + serverPort + "/test/queue/awaitChildCountStable/" +
1506+
taskId + "/" + expectedCount + "/" + timeoutMs))
1507+
.POST(HttpRequest.BodyPublishers.noBody())
1508+
.build();
1509+
1510+
HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
1511+
if (response.statusCode() != 200) {
1512+
throw new RuntimeException(response.statusCode() + ": Awaiting child queue count failed! " + response.body());
1513+
}
1514+
return Boolean.parseBoolean(response.body());
1515+
}
1516+
14951517
@Test
14961518
@Timeout(value = 1, unit = TimeUnit.MINUTES)
14971519
public void testInputRequiredWorkflow() throws Exception {

‎tests/server-common/src/test/java/io/a2a/server/apps/common/TestUtilsBean.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,29 @@ public void deleteTaskPushNotificationConfig(String taskId, String configId) {
6161
public void saveTaskPushNotificationConfig(String taskId, PushNotificationConfig notificationConfig) {
6262
pushNotificationConfigStore.setInfo(taskId, notificationConfig);
6363
}
64+
65+
public void awaitQueuePollerStart(String taskId) throws InterruptedException {
66+
queueManager.awaitQueuePollerStart(queueManager.get(taskId));
67+
}
68+
69+
public boolean awaitChildQueueCountStable(String taskId, int expectedCount, long timeoutMs) throws InterruptedException {
70+
long endTime = System.currentTimeMillis() + timeoutMs;
71+
int consecutiveMatches = 0;
72+
final int requiredMatches = 3; // Count must match 3 times in a row (150ms) to be considered stable
73+
74+
while (System.currentTimeMillis() < endTime) {
75+
int count = queueManager.getActiveChildQueueCount(taskId);
76+
if (count == expectedCount) {
77+
consecutiveMatches++;
78+
if (consecutiveMatches >= requiredMatches) {
79+
// Count is stable - all child queues exist and haven't closed
80+
return true;
81+
}
82+
} else {
83+
consecutiveMatches = 0; // Reset if count changes
84+
}
85+
Thread.sleep(50);
86+
}
87+
return false;
88+
}
6489
}

0 commit comments

Comments
 (0)