Skip to content

Commit

Permalink
Merge pull request #7819 from dmcgowan/1.6-portfoward-concurrent-read…
Browse files Browse the repository at this point in the history
…-write

[release/1.6] concurrent map iteration and map write
  • Loading branch information
dmcgowan committed Dec 14, 2022
2 parents f7e578e + 0e8f5e2 commit 7d02c97
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/cri/streaming/portforward/httpstream.go
Expand Up @@ -155,11 +155,11 @@ func (h *httpStreamHandler) getStreamPair(requestID string) (*httpStreamPair, bo
func (h *httpStreamHandler) monitorStreamPair(p *httpStreamPair, timeout <-chan time.Time) {
select {
case <-timeout:
err := fmt.Errorf("(conn=%v, request=%s) timed out waiting for streams", h.conn, p.requestID)
err := fmt.Errorf("(conn=%p, request=%s) timed out waiting for streams", h.conn, p.requestID)
utilruntime.HandleError(err)
p.printError(err.Error())
case <-p.complete:
klog.V(5).Infof("(conn=%v, request=%s) successfully received error and data streams", h.conn, p.requestID)
klog.V(5).Infof("(conn=%p, request=%s) successfully received error and data streams", h.conn, p.requestID)
}
h.removeStreamPair(p.requestID)
}
Expand Down

0 comments on commit 7d02c97

Please sign in to comment.