mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
69b4fe4065
1. As daemon.ContainerStop() documentation says, > If a negative number of seconds is given, ContainerStop > will wait for a graceful termination. but since commitcfdf84d5d0(PR #32237) this is no longer the case. This happens because `context.WithTimeout(ctx, timeout)` is implemented as `WithDeadline(ctx, time.Now().Add(timeout))`, resulting in a deadline which is in the past. To fix, don't use WithDeadline() if the timeout is negative. 2. Add a test case to validate the correct behavior and as a means to prevent a similar regression in the future. 3. Fix/improve daemon.ContainerStop() and client.ContainerStop() description for clarity and completeness. 4. Fix/improve DefaultStopTimeout description. Fixes:cfdf84d5d0("Update Container Wait") Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
26 lines
913 B
Go
26 lines
913 B
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"net/url"
|
|
"time"
|
|
|
|
timetypes "github.com/docker/docker/api/types/time"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
// ContainerStop stops a container. In case the container fails to stop
|
|
// gracefully within a time frame specified by the timeout argument,
|
|
// it is forcefully terminated (killed).
|
|
//
|
|
// If the timeout is nil, the container's StopTimeout value is used, if set,
|
|
// otherwise the engine default. A negative timeout value can be specified,
|
|
// meaning no timeout, i.e. no forceful termination is performed.
|
|
func (cli *Client) ContainerStop(ctx context.Context, containerID string, timeout *time.Duration) error {
|
|
query := url.Values{}
|
|
if timeout != nil {
|
|
query.Set("t", timetypes.DurationToSecondsString(*timeout))
|
|
}
|
|
resp, err := cli.post(ctx, "/containers/"+containerID+"/stop", query, nil, nil)
|
|
ensureReaderClosed(resp)
|
|
return err
|
|
}
|