From 588d9f324a34ac3443d8140976c4e676301bb05e Mon Sep 17 00:00:00 2001 From: dapengzhang0 Date: Tue, 22 Aug 2017 14:40:35 -0700 Subject: [PATCH 1/2] netty: fix transport spuriously in notInUse state --- .../java/io/grpc/netty/NettyClientHandler.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/netty/src/main/java/io/grpc/netty/NettyClientHandler.java b/netty/src/main/java/io/grpc/netty/NettyClientHandler.java index 9eeda18c3c2..f1b34e923ee 100644 --- a/netty/src/main/java/io/grpc/netty/NettyClientHandler.java +++ b/netty/src/main/java/io/grpc/netty/NettyClientHandler.java @@ -184,11 +184,6 @@ public void onGoAwayReceived(int lastStreamId, long errorCode, ByteBuf debugData } } - @Override - public void onStreamAdded(Http2Stream stream) { - NettyClientHandler.this.lifecycleManager.notifyInUse(true); - } - @Override public void onStreamRemoved(Http2Stream stream) { if (connection().numActiveStreams() == 0) { @@ -198,8 +193,13 @@ public void onStreamRemoved(Http2Stream stream) { @Override public void onStreamActive(Http2Stream stream) { - if (NettyClientHandler.this.keepAliveManager != null - && connection().numActiveStreams() == 1) { + if (connection().numActiveStreams() != 1) { + return; + } + + NettyClientHandler.this.lifecycleManager.notifyInUse(true); + + if (NettyClientHandler.this.keepAliveManager != null) { NettyClientHandler.this.keepAliveManager.onTransportActive(); } } From 77e14aa5833db399a430ba41255da5bbc171eba8 Mon Sep 17 00:00:00 2001 From: dapengzhang0 Date: Wed, 23 Aug 2017 10:56:11 -0700 Subject: [PATCH 2/2] use onStreamActive-onStreamClosed pair --- .../java/io/grpc/netty/NettyClientHandler.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/netty/src/main/java/io/grpc/netty/NettyClientHandler.java b/netty/src/main/java/io/grpc/netty/NettyClientHandler.java index f1b34e923ee..afef5f2686f 100644 --- a/netty/src/main/java/io/grpc/netty/NettyClientHandler.java +++ b/netty/src/main/java/io/grpc/netty/NettyClientHandler.java @@ -184,13 +184,6 @@ public void onGoAwayReceived(int lastStreamId, long errorCode, ByteBuf debugData } } - @Override - public void onStreamRemoved(Http2Stream stream) { - if (connection().numActiveStreams() == 0) { - NettyClientHandler.this.lifecycleManager.notifyInUse(false); - } - } - @Override public void onStreamActive(Http2Stream stream) { if (connection().numActiveStreams() != 1) { @@ -206,8 +199,13 @@ public void onStreamActive(Http2Stream stream) { @Override public void onStreamClosed(Http2Stream stream) { - if (NettyClientHandler.this.keepAliveManager != null - && connection().numActiveStreams() == 0) { + if (connection().numActiveStreams() != 0) { + return; + } + + NettyClientHandler.this.lifecycleManager.notifyInUse(false); + + if (NettyClientHandler.this.keepAliveManager != null) { NettyClientHandler.this.keepAliveManager.onTransportIdle(); } }