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

Fix bug where the stream id would not get incremented for buffered streams.

This commit is contained in:
Jakob Buchgraber 2015-04-09 12:00:51 -07:00
parent 9d214637e6
commit e8afa3ca23
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,7 @@ class NettyClientHandler extends Http2ConnectionHandler {
private Throwable connectionError;
private Status goAwayStatus;
private ChannelHandlerContext ctx;
private int nextStreamId;
public NettyClientHandler(Http2ConnectionEncoder encoder, Http2Connection connection,
Http2FrameReader frameReader, Http2LocalFlowController inboundFlow,
@ -84,6 +85,7 @@ class NettyClientHandler extends Http2ConnectionHandler {
// Disallow stream creation by the server.
connection.remote().maxActiveStreams(0);
connection.local().allowPushTo(false);
nextStreamId = connection.local().nextStreamId();
}
@Nullable
@ -232,7 +234,7 @@ class NettyClientHandler extends Http2ConnectionHandler {
*/
private void createStream(CreateStreamCommand command, final ChannelPromise promise) {
final Http2Connection.Endpoint<Http2LocalFlowController> local = connection().local();
final int streamId = local.nextStreamId();
final int streamId = getAndIncrementNextStreamId();
final NettyClientStream stream = command.stream();
final Http2Headers headers = command.headers();
// TODO: Send GO_AWAY if streamId overflows
@ -339,6 +341,12 @@ class NettyClientHandler extends Http2ConnectionHandler {
return connection().activeStreams().toArray(new Http2Stream[0]);
}
private int getAndIncrementNextStreamId() {
int id = nextStreamId;
nextStreamId += 2;
return id;
}
/**
* Initializes the connection window if we haven't already.
*/

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

@ -359,6 +359,17 @@ public class NettyClientHandlerTest extends NettyHandlerTestBase {
handler.decoder().flowController().windowSize(handler.connection().connectionStream()));
}
@Test
public void createIncrementsIdsForActualAndBufferdStreams() throws Exception {
receiveMaxConcurrentStreams(2);
handler.write(ctx, new CreateStreamCommand(grpcHeaders, stream), promise);
verify(stream).id(eq(3));
handler.write(ctx, new CreateStreamCommand(grpcHeaders, stream), promise);
verify(stream).id(eq(5));
handler.write(ctx, new CreateStreamCommand(grpcHeaders, stream), promise);
verify(stream).id(eq(7));
}
private void receiveMaxConcurrentStreams(int max) throws Exception {
ByteBuf serializedSettings = serializeSettings(new Http2Settings().maxConcurrentStreams(max));
handler.channelRead(ctx, serializedSettings);