erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-05 00:15:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix client hangs on stale SSH connections

Browse source 
Wrap ssh.DialNet in a goroutine so it respects context cancellation,
skip retries on context/timeout errors, and invalidate the cached
connection on failure.

Fixes: https://github.com/containers/podman/issues/28453

Signed-off-by: Jan Rodák <hony.com@seznam.cz>
This commit is contained in:
Jan Rodák 2026-06-11 16:07:48 +02:00
parent 303d6c0d84
commit ae825f6234
No known key found for this signature in database
GPG key ID: D458A9B20435C2BF
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkg/bindings/connection.go
View file

@ -297,8 +297,8 @@ func sshClient(_url *url.URL, uri string, identity string, machine bool) (Connec
val := strings.TrimSuffix(b.String(), "\n")
_url.Path = val
}
dialContext := func(_ context.Context, _, _ string) (net.Conn, error) {
return ssh.DialNet(conn, "unix", _url)
dialContext := func(ctx context.Context, _, _ string) (net.Conn, error) {
return ssh.DialNetContext(ctx, conn, "unix", _url)
}
connection.Client = &http.Client{
Transport: &http.Transport{
@ -314,8 +314,8 @@ func tcpClient(_url *url.URL, opts Options) (Connection, error) {
connection := Connection{
URI: _url,
}
dialContext := func(_ context.Context, _, _ string) (net.Conn, error) {
return net.Dial("tcp", _url.Host)
dialContext := func(ctx context.Context, _, _ string) (net.Conn, error) {
return (&net.Dialer{}).DialContext(ctx, "tcp", _url.Host)
}
// use proxy if env `CONTAINER_PROXY` set
if proxyURI, found := os.LookupEnv("CONTAINER_PROXY"); found {
@ -480,12 +480,17 @@ func (c *Connection) DoRequest(ctx context.Context, httpBody io.Reader, httpMeth
}
}
// Give the Do three chances in the case of a comm/service hiccup
// Give the Do three chances in the case of a comm/service hiccup.
// Don't retry on context or timeout errors — those won't recover.
for i := 1; i <= 3; i++ {
response, err = c.Client.Do(req) //nolint:bodyclose // The caller has to close the body.
if err == nil {
break
}
var netErr net.Error
if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) || (errors.As(err, &netErr) && netErr.Timeout()) {
break
}
time.Sleep(time.Duration(i*100) * time.Millisecond)
}
return &APIResponse{response, req}, err

2
pkg/domain/infra/runtime_tunnel.go
View file

@ -24,6 +24,8 @@ func newConnection(facts *entities.PodmanConfig, farmNodeName string) (context.C
if connection == nil || farmNodeName != "" {
ctx, err := newConnectionWithoutLock(context.Background(), facts)
if err != nil {
// Clear stale connection so the next call retries.
connection = nil
return ctx, err
}
connection = &ctx