Reduce flow control window for interop tests

ejona86 · ejona86 · commit ac9db3b1577c · 2015-07-14T14:42:55.000-07:00
Many of the interop tests were designed with the default 64 KB flow
control window in mind. If we test with 1 MB then it defeats the flow
control testing.

65 KB is an arbitrary number, but I chose it to be rather small, but
still not the HTTP/2-default 64 KB because implementations have had
trouble with applying flow control changes correctly.
diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java
@@ -250,6 +250,7 @@ protected ChannelImpl createChannel() {
           }
         }
         return NettyChannelBuilder.forAddress(new InetSocketAddress(address, serverPort))
+            .flowControlWindow(65 * 1024)
             .negotiationType(useTls ? NegotiationType.TLS : NegotiationType.PLAINTEXT)
             .sslContext(sslContext)
             .build();
diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java
@@ -56,6 +56,7 @@ public static void startServer() {
     startStaticServer(
         NettyServerBuilder
             .forAddress(new LocalAddress("in-process-1"))
+            .flowControlWindow(65 * 1024)
             .channelType(LocalServerChannel.class));
   }
 
diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java
@@ -57,6 +57,7 @@ public class Http2NettyTest extends AbstractTransportTest {
   public static void startServer() {
     try {
       startStaticServer(NettyServerBuilder.forPort(serverPort)
+          .flowControlWindow(65 * 1024)
           .sslContext(GrpcSslContexts
               .forServer(TestUtils.loadCert("server1.pem"), TestUtils.loadCert("server1.key"))
               .ciphers(TestUtils.preferredTestCiphers(), SupportedCipherSuiteFilter.INSTANCE)

Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,7 @@ protected ChannelImpl createChannel() {`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`	`return NettyChannelBuilder.forAddress(new InetSocketAddress(address, serverPort))`
	`253`	`+ .flowControlWindow(65 * 1024)`
`253`	`254`	`.negotiationType(useTls ? NegotiationType.TLS : NegotiationType.PLAINTEXT)`
`254`	`255`	`.sslContext(sslContext)`
`255`	`256`	`.build();`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ public static void startServer() {`
`56`	`56`	`startStaticServer(`
`57`	`57`	`NettyServerBuilder`
`58`	`58`	`.forAddress(new LocalAddress("in-process-1"))`
	`59`	`+ .flowControlWindow(65 * 1024)`
`59`	`60`	`.channelType(LocalServerChannel.class));`
`60`	`61`	`}`
`61`	`62`