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

netty: Refine workaround for Netty header processing for transparent retries 

Nginx and C core don't do graceful GOAWAY and retries have matured such
that transparent retries may soon be on by default. Refining the
workaround thus can reduces error rate for users.

Fixes #8310
This commit is contained in:
Eric Anderson 2021-07-30 13:24:05 -07:00 committed by Eric Anderson
parent d836f38979
commit b2764595e6
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netty/src/main/java/io/grpc/netty/NettyClientHandler.java
View File

@ -822,6 +822,7 @@ class NettyClientHandler extends AbstractNettyHandler {
// UNAVAILABLE. https://github.com/netty/netty/issues/10670
final Status abruptGoAwayStatusConservative = statusFromH2Error(
null, "Abrupt GOAWAY closed sent stream", errorCode, debugData);
final boolean mayBeHittingNettyBug = errorCode != Http2Error.NO_ERROR.code();
// Try to allocate as many in-flight streams as possible, to reduce race window of
// https://github.com/grpc/grpc-java/issues/2562 . To be of any help, the server has to
// gracefully shut down the connection with two GOAWAYs. gRPC servers generally send a PING
@ -848,11 +849,12 @@ class NettyClientHandler extends AbstractNettyHandler {
if (clientStream != null) {
// RpcProgress _should_ be REFUSED, but are being conservative. See comment for
// abruptGoAwayStatusConservative. This does reduce our ability to perform transparent
// retries, but our main goal of transporent retries is to resolve the local race. We
// still hope/expect servers to use the graceful double-GOAWAY when closing
// connections.
// retries, but only if something else caused a connection failure.
RpcProgress progress = mayBeHittingNettyBug
? RpcProgress.PROCESSED
: RpcProgress.REFUSED;
clientStream.transportReportStatus(
abruptGoAwayStatusConservative, RpcProgress.PROCESSED, false, new Metadata());
abruptGoAwayStatusConservative, progress, false, new Metadata());
}
stream.close();
}

11
netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java
View File

@ -331,9 +331,18 @@ public class NettyClientHandlerTest extends NettyHandlerTestBase<NettyClientHand
}
@Test
public void receivedGoAwayShouldRefuseLaterStreamId() throws Exception {
public void receivedGoAwayNoErrorShouldRefuseLaterStreamId() throws Exception {
ChannelFuture future = enqueue(newCreateStreamCommand(grpcHeaders, streamTransportState));
channelRead(goAwayFrame(streamId - 1));
verify(streamListener).closed(any(Status.class), eq(REFUSED), any(Metadata.class));
assertTrue(future.isDone());
}
@Test
public void receivedGoAwayErrorShouldRefuseLaterStreamId() throws Exception {
ChannelFuture future = enqueue(newCreateStreamCommand(grpcHeaders, streamTransportState));
channelRead(
goAwayFrame(streamId - 1, (int) Http2Error.PROTOCOL_ERROR.code(), Unpooled.EMPTY_BUFFER));
// This _should_ be REFUSED, but we purposefully use PROCESSED. See comment for
// abruptGoAwayStatusConservative in NettyClientHandler
verify(streamListener).closed(any(Status.class), eq(PROCESSED), any(Metadata.class));