convert implicit BDP toggle to explicit

Author: Pramodh-G

default_dial_option_server_option_test.go

@@ -146,6 +146,10 @@ func (s) TestJoinDialOption(t *testing.T) {
 	if cc.dopts.copts.InitialWindowSize != initialWindowSize {
 		t.Fatalf("Unexpected cc.dopts.copts.InitialWindowSize: %d != %d", cc.dopts.copts.InitialWindowSize, initialWindowSize)
 	}
+	// Make sure static window size is not enabled when using WithInitialWindowSize.
+	if cc.dopts.copts.StaticWindowSize {
+		t.Fatalf("Unexpected cc.dopts.copts.StaticWindowSize: %t", cc.dopts.copts.StaticWindowSize)
+	}
 }
 
 // TestJoinServerOption tests the join server option. It configures a joined
@@ -162,6 +166,10 @@ func (s) TestJoinServerOption(t *testing.T) {
 	if s.opts.initialWindowSize != initialWindowSize {
 		t.Fatalf("Unexpected s.opts.initialWindowSize: %d != %d", s.opts.initialWindowSize, initialWindowSize)
 	}
+	// Make sure static window size is not enabled when using InitialWindowSize.
+	if s.opts.staticWindowSize {
+		t.Fatalf("Unexpected s.opts.staticWindowSize: %t", s.opts.staticWindowSize)
+	}
 }
 
 // funcTestHeaderListSizeDialOptionServerOption tests

test/channelz_test.go

@@ -1061,6 +1061,10 @@ func (s) TestCZClientSocketMetricsStreamsAndMessagesCount(t *testing.T) {
 func (s) TestCZClientAndServerSocketMetricsStreamsCountFlowControlRSTStream(t *testing.T) {
 	e := tcpClearRREnv
 	te := newTest(t, e)
+	// Before behavior change in PR #8665, large window sizes set
+	// using InitialWindowSize disabled BDP by default. Post the
+	// behavior change, we have to explicitly disable BDP.
+	te.serverStaticWindowSize = true
 	te.serverInitialWindowSize = 65536
 	// Avoid overflowing connection level flow control window, which will lead to
 	// transport being closed.

test/end2end_test.go

@@ -5385,14 +5385,21 @@ func (s) TestClientWriteFailsAfterServerClosesStream(t *testing.T) {
 }
 
 type windowSizeConfig struct {
+	serverStaticWindowSize bool
+	clientStaticWindowSize bool
 	serverStream int32
 	serverConn   int32
 	clientStream int32
 	clientConn   int32
 }
 
 func (s) TestConfigurableWindowSizeWithLargeWindow(t *testing.T) {
+	// Before behavior change in PR #8665, large window sizes set
+	// using WithInitialWindowSize disabled BDP by default. Post the
+	// behavior change, we have to explicitly disable BDP.
 	wc := windowSizeConfig{
+		serverStaticWindowSize: true,
+		clientStaticWindowSize: true,
 		serverStream: 8 * 1024 * 1024,
 		serverConn:   12 * 1024 * 1024,
 		clientStream: 6 * 1024 * 1024,
@@ -5417,6 +5424,8 @@ func (s) TestConfigurableWindowSizeWithSmallWindow(t *testing.T) {
 
 func testConfigurableWindowSize(t *testing.T, e env, wc windowSizeConfig) {
 	te := newTest(t, e)
+	te.serverStaticWindowSize = wc.serverStaticWindowSize
+	te.clientStaticWindowSize = wc.clientStaticWindowSize
 	te.serverInitialWindowSize = wc.serverStream
 	te.serverInitialConnWindowSize = wc.serverConn
 	te.clientInitialWindowSize = wc.clientStream

test/stream_cleanup_test.go

@@ -48,7 +48,9 @@ func (s) TestStreamCleanup(t *testing.T) {
 			return &testpb.Empty{}, nil
 		},
 	}
-	if err := ss.Start(nil, grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(int(callRecvMsgSize))), grpc.WithInitialWindowSize(int32(initialWindowSize))); err != nil {
+
+	// Use a static flow control window.
+	if err := ss.Start(nil, grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(int(callRecvMsgSize))), grpc.WithStaticStreamWindowSize(int32(initialWindowSize))); err != nil {
 		t.Fatalf("Error starting endpoint server: %v", err)
 	}
 	defer ss.Stop()
@@ -81,7 +83,8 @@ func (s) TestStreamCleanupAfterSendStatus(t *testing.T) {
 			})
 		},
 	}
-	if err := ss.Start(nil, grpc.WithInitialWindowSize(int32(initialWindowSize))); err != nil {
+	// Use a static flow control window.
+	if err := ss.Start(nil, grpc.WithStaticStreamWindowSize(int32(initialWindowSize))); err != nil {
 		t.Fatalf("Error starting endpoint server: %v", err)
 	}
 	defer ss.Stop()