http2: set up the timer of closing idle connection after the initialization

panjf2000 · gopherbot · commit c87a5b62e243 · 2024-05-16T22:34:05.000Z
Fixes golang/go#66763 Change-Id: I046028b6072a6da77e7f1b4d1f2e6b14f8edb042 Reviewed-on: https://go-review.googlesource.com/c/net/+/578115 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Damien Neil <dneil@google.com> Auto-Submit: Damien Neil <dneil@google.com>
diff --git a/http2/transport.go b/http2/transport.go
@@ -826,10 +826,6 @@ func (t *Transport) newClientConn(c net.Conn, singleUse bool, hooks *testSyncHoo
 		hooks.newclientconn(cc)
 		c = cc.tconn
 	}
-	if d := t.idleConnTimeout(); d != 0 {
-		cc.idleTimeout = d
-		cc.idleTimer = cc.afterFunc(d, cc.onIdleTimeout)
-	}
 	if VerboseLogs {
 		t.vlogf("http2: Transport creating client conn %p to %v", cc, c.RemoteAddr())
 	}
@@ -893,6 +889,12 @@ func (t *Transport) newClientConn(c net.Conn, singleUse bool, hooks *testSyncHoo
 		return nil, cc.werr
 	}
 
+	// Start the idle timer after the connection is fully initialized.
+	if d := t.idleConnTimeout(); d != 0 {
+		cc.idleTimeout = d
+		cc.idleTimer = cc.afterFunc(d, cc.onIdleTimeout)
+	}
+
 	cc.goRun(cc.readLoop)
 	return cc, nil
 }
diff --git a/http2/transport_test.go b/http2/transport_test.go
@@ -5426,3 +5426,28 @@ func TestTransportDataAfter1xxHeader(t *testing.T) {
 	}
 	tc.wantFrameType(FrameRSTStream)
 }
+
+func TestIssue66763Race(t *testing.T) {
+	tr := &Transport{
+		IdleConnTimeout: 1 * time.Nanosecond,
+		AllowHTTP:       true, // issue 66763 only occurs when AllowHTTP is true
+	}
+	defer tr.CloseIdleConnections()
+
+	cli, srv := net.Pipe()
+	donec := make(chan struct{})
+	go func() {
+		// Creating the client conn may succeed or fail,
+		// depending on when the idle timeout happens.
+		// Either way, the idle timeout will close the net.Conn.
+		tr.NewClientConn(cli)
+		close(donec)
+	}()
+
+	// The client sends its preface and SETTINGS frame,
+	// and then closes its conn after the idle timeout.
+	io.ReadAll(srv)
+	srv.Close()
+
+	<-donec
+}

Original file line number	Diff line number	Diff line change
`@@ -826,10 +826,6 @@ func (t Transport) newClientConn(c net.Conn, singleUse bool, hooks testSyncHoo`
`826`	`826`	`hooks.newclientconn(cc)`
`827`	`827`	`c = cc.tconn`
`828`	`828`	`}`
`829`		`- if d := t.idleConnTimeout(); d != 0 {`
`830`		`- cc.idleTimeout = d`
`831`		`- cc.idleTimer = cc.afterFunc(d, cc.onIdleTimeout)`
`832`		`- }`
`833`	`829`	`if VerboseLogs {`
`834`	`830`	`t.vlogf("http2: Transport creating client conn %p to %v", cc, c.RemoteAddr())`
`835`	`831`	`}`
`@@ -893,6 +889,12 @@ func (t Transport) newClientConn(c net.Conn, singleUse bool, hooks testSyncHoo`
`893`	`889`	`return nil, cc.werr`
`894`	`890`	`}`
`895`	`891`
	`892`	`+ // Start the idle timer after the connection is fully initialized.`
	`893`	`+ if d := t.idleConnTimeout(); d != 0 {`
	`894`	`+ cc.idleTimeout = d`
	`895`	`+ cc.idleTimer = cc.afterFunc(d, cc.onIdleTimeout)`
	`896`	`+ }`
	`897`	`+`
`896`	`898`	`cc.goRun(cc.readLoop)`
`897`	`899`	`return cc, nil`
`898`	`900`	`}`