fix fatal error: concurrent map iteration and map write

ningmingxiao · ningmingxiao · commit abd1692cf27b · 2025-02-08T09:41:52.000+08:00
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn> (cherry picked from commit 0fe9f0b) Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
diff --git a/pkg/cri/streaming/portforward/httpstream.go b/pkg/cri/streaming/portforward/httpstream.go
@@ -279,7 +279,7 @@ func (h *httpStreamHandler) portForward(p *httpStreamPair) {
 		// see: https://github.com/kubernetes/kubernetes/issues/74551 for detail
 		//
 		// In both cases, we should RESET the httpStream.
-		klog.ErrorS(err, "forwarding port", "conn", h.conn, "request", p.requestID, "port", portString)
+		klog.Errorf("(conn=%p, request=%s) forwarding port %s failed: %v", h.conn, p.requestID, portString, err)
 		resetStreams = true
 		return
 	}

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ func (h httpStreamHandler) portForward(p httpStreamPair) {`
`279`	`279`	`// see: https://github.com/kubernetes/kubernetes/issues/74551 for detail`
`280`	`280`	`//`
`281`	`281`	`// In both cases, we should RESET the httpStream.`
`282`		`- klog.ErrorS(err, "forwarding port", "conn", h.conn, "request", p.requestID, "port", portString)`
	`282`	`+ klog.Errorf("(conn=%p, request=%s) forwarding port %s failed: %v", h.conn, p.requestID, portString, err)`
`283`	`283`	`resetStreams = true`
`284`	`284`	`return`
`285`	`285`	`}`