Skip to content

improve unit test make sure thread context propagate to executor thread #21200

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
gaobinlong merged 2 commits into from
Apr 13, 2026
Merged

improve unit test make sure thread context propagate to executor thread #21200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3dea65
add test to make sure thread context propagate to executor thread
Hailong-am Apr 10, 2026
018f585
Merge branch 'main' into fix/transport-streaming-threadcontext
Hailong-am Apr 13, 2026
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
29 changes: 13 additions & 16 deletions ...t-rpc/src/test/java/org/opensearch/arrow/flight/transport/FlightOutboundHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

package org.opensearch.arrow.flight.transport;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.VectorSchemaRoot;
import org.opensearch.Version;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.core.transport.TransportResponse;
Expand All @@ -25,6 +27,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
Expand Down Expand Up @@ -54,6 +57,8 @@ public void setUp() throws Exception {

mockFlightChannel = mock(FlightServerChannel.class);
when(mockFlightChannel.getExecutor()).thenReturn(executor);
when(mockFlightChannel.getAllocator()).thenReturn(mock(BufferAllocator.class));
when(mockFlightChannel.getRoot()).thenReturn(mock(VectorSchemaRoot.class));

mockListener = mock(TransportMessageListener.class);
handler.setMessageListener(mockListener);
Expand All @@ -72,11 +77,7 @@ public void testSendResponseBatchPreservesCallerThreadContext() throws Exception
ThreadContext threadContext = threadPool.getThreadContext();
threadContext.putHeader(HEADER_KEY, HEADER_VALUE);

CountDownLatch latch = new CountDownLatch(1);
doAnswer(invocation -> {
latch.countDown();
return null;
}).when(mockListener).onResponseSent(anyLong(), anyString(), any(TransportResponse.class));
doAnswer(invocation -> null).when(mockListener).onResponseSent(anyLong(), anyString(), any(TransportResponse.class));

handler.sendResponseBatch(
Version.CURRENT,
Expand Down Expand Up @@ -140,20 +141,15 @@ public void testSendResponseBatchPropagatesContextToExecutorThread() throws Exce
threadContext.putHeader(HEADER_KEY, HEADER_VALUE);

CountDownLatch latch = new CountDownLatch(1);
AtomicReference<String> capturedHeader = new AtomicReference<>();

// Use a mock executor that runs the preserveContext-wrapped runnable
ExecutorService mockExecutor = mock(ExecutorService.class);
// Capture the thread context header inside onResponseSent, which runs
// within the preserveContext wrapper on the executor thread
doAnswer(invocation -> {
Runnable command = invocation.getArgument(0);
executor.execute(() -> {
command.run();
// After the preserveContext wrapper runs, capture the header
// The wrapper stashes the executor thread context, restores caller's, runs, then restores executor's
latch.countDown();
});
capturedHeader.set(threadPool.getThreadContext().getHeader(HEADER_KEY));
latch.countDown();
return null;
}).when(mockExecutor).execute(any(Runnable.class));
when(mockFlightChannel.getExecutor()).thenReturn(mockExecutor);
}).when(mockListener).onResponseSent(anyLong(), anyString(), any(TransportResponse.class));

handler.sendResponseBatch(
Version.CURRENT,
Expand All @@ -168,6 +164,7 @@ public void testSendResponseBatchPropagatesContextToExecutorThread() throws Exce
);

assertTrue("Executor task should complete", latch.await(5, TimeUnit.SECONDS));
assertEquals("Context should be propagated to executor thread", HEADER_VALUE, capturedHeader.get());
}

public void testMultipleBatchesMaintainCallerContext() throws Exception {
Expand Down
Loading