Skip to content
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

stub: fix onError metadata race condition #11979

Merged
merged 2 commits into from
Apr 7, 2025
Merged

stub: fix onError metadata race condition #11979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e47028a
fix metadata
JoeCqupt Mar 25, 2025
701f655
add unit test
JoeCqupt Mar 25, 2025
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
7 changes: 4 additions & 3 deletions stub/src/main/java/io/grpc/stub/ServerCalls.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,10 @@ public void onNext(RespT response) {

@Override
public void onError(Throwable t) {
Metadata metadata = Status.trailersFromThrowable(t);
if (metadata == null) {
metadata = new Metadata();
Metadata metadata = new Metadata();
Metadata trailers = Status.trailersFromThrowable(t);
if (trailers != null) {
metadata.merge(trailers);
}
call.close(Status.fromThrowable(t), metadata);
aborted = true;
Expand Down
31 changes: 31 additions & 0 deletions stub/src/test/java/io/grpc/stub/ServerCallsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,35 @@ public void invoke(Integer req, StreamObserver<Integer> responseObserver) {
listener.onHalfClose();
}

@Test
public void clientSendsOne_serverOnErrorWithTrailers_serverStreaming() {
Metadata trailers = new Metadata();
Metadata.Key<String> key = Metadata.Key.of("trailers-test-key1",
Metadata.ASCII_STRING_MARSHALLER);
trailers.put(key, "trailers-test-value1");

ServerCallRecorder serverCall = new ServerCallRecorder(SERVER_STREAMING_METHOD);
ServerCallHandler<Integer, Integer> callHandler = ServerCalls.asyncServerStreamingCall(
new ServerCalls.ServerStreamingMethod<Integer, Integer>() {
@Override
public void invoke(Integer req, StreamObserver<Integer> responseObserver) {
responseObserver.onError(
Status.fromCode(Status.Code.INTERNAL)
.asRuntimeException(trailers)
);
}
});
ServerCall.Listener<Integer> listener = callHandler.startCall(serverCall, new Metadata());
serverCall.isReady = true;
serverCall.isCancelled = false;
listener.onReady();
listener.onMessage(1);
listener.onHalfClose();
// verify trailers key is set
assertTrue(serverCall.trailers.containsKey(key));
assertTrue(serverCall.status.equals(Status.INTERNAL));
}

@Test
public void inprocessTransportManualFlow() throws Exception {
final Semaphore semaphore = new Semaphore(1);
Expand Down Expand Up @@ -652,6 +681,7 @@ private static class ServerCallRecorder extends ServerCall<Integer, Integer> {
private boolean isCancelled;
private boolean isReady;
private int onReadyThreshold;
private Metadata trailers;

public ServerCallRecorder(MethodDescriptor<Integer, Integer> methodDescriptor) {
this.methodDescriptor = methodDescriptor;
Expand All @@ -674,6 +704,7 @@ public void sendMessage(Integer message) {
@Override
public void close(Status status, Metadata trailers) {
this.status = status;
this.trailers = trailers;
}

@Override
Expand Down