grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: fix boq conformance failures (#8281) 

Fix false alarm to please boq conformance verifications, ref. go/boq-conformance-violations/BLOCKING#what-should-i-do-instead.
This commit is contained in:
yifeizhuang 2021-06-24 08:07:06 -07:00 committed by GitHub
parent c092d94255
commit c1ad5de135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/io/grpc/internal/ServerImpl.java
View File

@ -28,6 +28,7 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.SettableFuture;
import io.grpc.Attributes; import io.grpc.Attributes;
@ -53,7 +54,6 @@ import io.grpc.ServerMethodDefinition;
import io.grpc.ServerServiceDefinition; import io.grpc.ServerServiceDefinition;
import io.grpc.ServerTransportFilter; import io.grpc.ServerTransportFilter;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.StatusException;
import io.perfmark.Link; import io.perfmark.Link;
import io.perfmark.PerfMark; import io.perfmark.PerfMark;
import io.perfmark.Tag; import io.perfmark.Tag;
@ -606,17 +606,11 @@ public final class ServerImpl extends io.grpc.Server implements InternalInstrume
private void runInternal() { private void runInternal() {
ServerStreamListener listener = NOOP_LISTENER; ServerStreamListener listener = NOOP_LISTENER;
ServerCallParameters<?,?> callParameters;
try { try {
if (future.isCancelled()) { if (future.isCancelled()) {
return; return;
} }
if (!future.isDone() || (callParameters = future.get()) == null) { listener = startWrappedCall(methodName, Futures.getDone(future), headers);
Status status = Status.INTERNAL.withDescription(
"Unexpected failure retrieving server call parameters.");
throw new StatusException(status);
}
listener = startWrappedCall(methodName, callParameters, headers);
} catch (Throwable ex) { } catch (Throwable ex) {
stream.close(Status.fromThrowable(ex), new Metadata()); stream.close(Status.fromThrowable(ex), new Metadata());
context.cancel(null); context.cancel(null);

5
core/src/test/java/io/grpc/internal/ServerImplTest.java
View File

@ -74,6 +74,7 @@ import io.grpc.ServerStreamTracer;
import io.grpc.ServerTransportFilter; import io.grpc.ServerTransportFilter;
import io.grpc.ServiceDescriptor; import io.grpc.ServiceDescriptor;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.Status.Code;
import io.grpc.StringMarshaller; import io.grpc.StringMarshaller;
import io.grpc.internal.ServerImpl.JumpToApplicationThreadServerStreamListener; import io.grpc.internal.ServerImpl.JumpToApplicationThreadServerStreamListener;
import io.grpc.internal.ServerImplBuilder.ClientTransportServersBuilder; import io.grpc.internal.ServerImplBuilder.ClientTransportServersBuilder;
@ -533,6 +534,7 @@ public class ServerImplTest {
} }
@Test @Test
@SuppressWarnings("CheckReturnValue")
public void executorSupplierFutureNotSet() throws Exception { public void executorSupplierFutureNotSet() throws Exception {
builder.executorSupplier = new ServerCallExecutorSupplier() { builder.executorSupplier = new ServerCallExecutorSupplier() {
@Override @Override
@ -575,7 +577,8 @@ public class ServerImplTest {
assertThat(callReference.get()).isNull(); assertThat(callReference.get()).isNull();
verify(stream, times(2)).close(statusCaptor.capture(), any(Metadata.class)); verify(stream, times(2)).close(statusCaptor.capture(), any(Metadata.class));
Status status = statusCaptor.getAllValues().get(1); Status status = statusCaptor.getAllValues().get(1);
assertEquals(Status.Code.INTERNAL, status.getCode()); assertEquals(Code.UNKNOWN, status.getCode());
assertThat(status.getCause() instanceof IllegalStateException);
} }
@Test @Test