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

Convert Netty IOExceptions to UNAVAILABLE. 

Also inspecting the entire causal chain to identify the best possible Status.

Fixes #1053
Fixes #1522
This commit is contained in:
nmittler 2016-04-12 12:02:42 -07:00
parent 43439325bc
commit 22e719a5f9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
netty/src/main/java/io/grpc/netty/AbstractNettyHandler.java
View File

@ -38,7 +38,6 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http2.Http2ConnectionDecoder;
import io.netty.handler.codec.http2.Http2ConnectionEncoder;
import io.netty.handler.codec.http2.Http2ConnectionHandler;
import io.netty.handler.codec.http2.Http2Error;
import io.netty.handler.codec.http2.Http2Exception;
import io.netty.handler.codec.http2.Http2Settings;
import io.netty.handler.codec.http2.Http2Stream;
@ -84,12 +83,12 @@ abstract class AbstractNettyHandler extends Http2ConnectionHandler {
public final void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
Http2Exception embedded = getEmbeddedHttp2Exception(cause);
if (embedded == null) {
// Kill the connection instead of propagating the exceptionCaught(). Http2ConnectionHandler
// only handles Http2Exceptions and propagates everything else.
String message = cause.getMessage() == null ? "Unknown error occurred" : cause.getMessage();
cause = Http2Exception.connectionError(Http2Error.INTERNAL_ERROR, cause, message);
// There was no embedded Http2Exception, assume it's a connection error. Subclasses are
// responsible for storing the appropriate status and shutting down the connection.
onError(ctx, cause);
} else {
super.exceptionCaught(ctx, cause);
}
super.exceptionCaught(ctx, cause);
}
protected final ChannelHandlerContext ctx() {