Update Container Wait by jlhawn · Pull Request #32237 · moby/moby

jlhawn · 2017-03-30T21:00:40Z

Summary

The goal for this PR is to be able to use the POST /containers/{name}/wait API in order to no longer rely on the Events API when doing docker run ... and docker start in attached mode. Here is the set of behavioral changes in the API and CLI:

The wait API now has on optional query parameter, condition, which specifies the state of the container which the client would like to wait for:
- not-running
  
  This is the default value which maintains the existing behavior of the Wait API. It blocks if the container is in a state which is considered to be running, i.e., any of running, paused, or restarting. If it is already not in any of those states, then it would not block at all and return immediately with the current exit code.
- next-exit
  
  This condition allows the client to wait for the container's state to change to a not-running state or to be removed. This is different from the not-running option because it will block if the container is in the created, exited, dead, or removing state, blocking through a transition to one of the running states and back to one of exited states or until the container is removed, whichever comes first. It is similar to waiting for a die or destroy event. This option is very useful to use before issuing a container start API request.
- removed
  
  This condition allows the client to wait for the container to be removed. It is similar to waiting for a destroy event.
The Wait API will now return HTTP response headers immediately. This serves an an acknowledgement that a wait has been registered. The JSON response body will not be returned until the wait condition is met.
The Wait API's request context is extended to wait for a http.CloseNotifier event in the case that the client closes the connection while the server is blocked on the wait condition. This prevents leaked goroutines but should only be necessary until we switch to using Go 1.8's request context which cancels automatically if the client disconnects.
To handle a manual detach (when the user enters the detach keys sequence when attached in TTY mode), the CLI now detects this key sequence, stops sending stdin, and causes the CLI to exit immediately. This is done as an alternative to waiting for a detach event. The rug has been pulled out from under this bullet point. This will have to be done in the github.com/docker/cli repo along with the other CLI changes.

Follow-up to #31794

Fixes #32242

tonistiigi · 2017-03-30T23:15:36Z

@WeiZhang555 @cpuguy83 any concerns for the approach?

WeiZhang555 · 2017-03-31T02:05:47Z

The design looks good, I like it :-)
#31744 seems need to reimplement based on this, it could be simplified a lot with this PR.

cpuguy83 · 2017-03-31T02:06:57Z

@WeiZhang555 Indeed, however we still need to support old daemons.

WeiZhang555 · 2017-03-31T02:19:50Z

@cpuguy83 Yep, you're right, then we have to keep both waitExitOrRemoved and this, backward compatibility makes this so complicated 😢

jlhawn · 2017-03-31T06:33:23Z

Well, at least janky seems happy with this first commit. I'll have to look into the failures with windowsRS1 and z tests later. I'll push the second commit now.

jlhawn · 2017-03-31T21:15:50Z

I've removed the [WIP] label from this PR and made the necessary changes to the API client and docs. Please take a look. I've also updated the waitExitOrRemoved() function in a way that maintains compatibility with older versions.

While all of the integration tests pass locally for me, I have seen some flakiness in a few tests that Jenkins runs. They mostly get this error:

Cannot kill container {ContainerID}: Container {ContinerID} is not running

But I can't tell if it's related to my changes or not since I tried not to modify container state/lifecycle in any way.

jlhawn · 2017-03-31T21:57:12Z

cli/command/container/utils.go

Oops, I forgot to do statusC <- 125 here.

dnephin

LGTM

A bit light on tests, but I guess we can address that later.

Are all 12 commits still relevant? Do you think some of them could be squashed now that this is ready to merge?

This patch consolidates the two WaitStop and WaitWithContext methods on the container.State type. Now there is a single method, Wait, which takes a context and a bool specifying whether to wait for not just a container exit but also removal. The behavior has been changed slightly so that a wait call during a Created state will not return immediately but instead wait for the container to be started and then exited. The interface has been changed to no longer block, but instead returns a channel on which the caller can receive a *StateStatus value which indicates the ExitCode or an error if there was one (like a context timeout or state transition error). These changes have been propagated through the rest of the deamon to preserve all other existing behavior. Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn)

This patch adds the untilRemoved option to the ContainerWait API which allows the client to wait until the container is not only exited but also removed. This patch also adds some more CLI integration tests for waiting for a created container and waiting with the new --until-removed flag. Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn) Handle detach sequence in CLI Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn) Update Container Wait Conditions Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn) Apply container wait changes to API 1.30 The set of changes to the containerWait API missed the cut for the Docker 17.05 release (API version 1.29). This patch bumps the version checks to use 1.30 instead. This patch also makes a minor update to a testfile which was added to the builder/dockerfile package. Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn) Remove wait changes from CLI Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn) Address minor nits on wait changes - Changed the name of the tty Proxy wrapper to `escapeProxy` - Removed the unnecessary Error() method on container.State - Fixes a typo in comment (repeated word) Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn) Use router.WithCancel in the containerWait handler This handler previously added this functionality manually but now uses the existing wrapper which does it for us. Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn) Add WaitCondition constants to api/types/container Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn) Address more ContainerWait review comments - Update ContainerWait backend interface to not return pointer values for container.StateStatus type. - Updated container state's Wait() method comments to clarify that a context MUST be used for cancelling the request, setting timeouts, and to avoid goroutine leaks. - Removed unnecessary buffering when making channels in the client's ContainerWait methods. - Renamed result and error channels in client's ContainerWait methods to clarify that only a single result or error value would be sent on the channel. Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn) Move container.WaitCondition type to separate file ... to avoid conflict with swagger-generated code for API response Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn) Address more ContainerWait review comments Docker-DCO-1.1-Signed-off-by: Josh Hawn <[email protected]> (github: jlhawn)

jlhawn · 2017-05-16T22:14:06Z

Rebased and squashed, it's now just 2 commits.

thaJeztah · 2017-05-16T22:15:10Z

Thanks!

thaJeztah · 2017-05-17T00:39:49Z

All 💚

jlhawn · 2017-05-17T02:15:45Z

The CLI changes are now in a PR against the docker/cli repo here: docker/cli#101

1. As daemon.ContainerStop() documentation says, > If a negative number of seconds is given, ContainerStop > will wait for a graceful termination. but since commit cfdf84d (PR moby#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: cfdf84d ("Update Container Wait") Signed-off-by: Kir Kolyshkin <[email protected]>

GordonTheTurtle added the status/0-triage label Mar 30, 2017

thaJeztah added status/1-design-review and removed status/0-triage labels Mar 30, 2017

jlhawn force-pushed the update_container_wait branch from 119fb19 to b4532ac Compare March 30, 2017 21:31

jlhawn mentioned this pull request Mar 30, 2017

docker run can't rely on the Events API. #32242

Closed

tonistiigi changed the title ~~Update Container Wait~~ [wip] Update Container Wait Mar 30, 2017

jlhawn force-pushed the update_container_wait branch from b4532ac to f344448 Compare March 30, 2017 23:40

jlhawn force-pushed the update_container_wait branch from f344448 to 4d72b20 Compare March 31, 2017 02:17

jlhawn force-pushed the update_container_wait branch 3 times, most recently from bf5dbce to 0a3032b Compare March 31, 2017 16:20

jlhawn added rebuild/experimental labels Mar 31, 2017

GordonTheTurtle removed rebuild/experimental labels Mar 31, 2017

jlhawn force-pushed the update_container_wait branch 3 times, most recently from 0348904 to c8cf3fa Compare March 31, 2017 21:10

jlhawn changed the title ~~[wip] Update Container Wait~~ Update Container Wait Mar 31, 2017

jlhawn commented Mar 31, 2017

View reviewed changes

cli/command/container/utils.go Outdated

Copy link

Contributor Author

jlhawn Mar 31, 2017 •

edited

Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I forgot to do statusC <- 125 here.

jlhawn force-pushed the update_container_wait branch 2 times, most recently from 64f354d to a43fd26 Compare April 1, 2017 01:04

jlhawn added the rebuild/powerpc label Apr 1, 2017

GordonTheTurtle removed the rebuild/powerpc label Apr 1, 2017

dnephin approved these changes May 16, 2017

View reviewed changes

Josh Hawn added 2 commits May 16, 2017 15:09

jlhawn force-pushed the update_container_wait branch from ec867d4 to 4921171 Compare May 16, 2017 22:13

tonistiigi added status/4-merge and removed status/2-code-review labels May 16, 2017

thaJeztah merged commit c053a20 into moby:master May 17, 2017

jlhawn mentioned this pull request May 17, 2017

docker run can't rely on the Events API. docker/cli#100

Closed

jlhawn deleted the update_container_wait branch May 17, 2017 02:15

jlhawn mentioned this pull request May 17, 2017

Test CLI changes for Container Wait #33255

Closed

nishanttotla mentioned this pull request May 17, 2017

Moving docker service digest pinning to client side docker/cli#30

Merged

mlaventure mentioned this pull request Jun 13, 2017

docker kill weaveproxy hangs indefinitely #31447

Closed

This was referenced Jul 1, 2017

docker wait hangs for non-existent containers docker/for-mac#1714

Closed

docker wait hangs for non-existent containers #33964

Closed

dnephin mentioned this pull request Sep 26, 2017

Multiple run of docker run --rm hangs in a host docker/for-linux#115

Open

3 tasks

jshachm mentioned this pull request Oct 27, 2017

docker restart -t with negative input time return different results after change the backend #35311

Closed

jshachm mentioned this pull request Nov 7, 2017

Fix negative time out policy when stop the container #35418

Closed

kolyshkin mentioned this pull request Apr 17, 2018

daemon.ContainerStop(): fix for a negative timeout #36874

Merged

thaJeztah mentioned this pull request Jan 29, 2020

Golang client library - New signature for ContainerWait makes it difficult to use #40430

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Update Container Wait#32237

Update Container Wait#32237
thaJeztah merged 2 commits intomoby:masterfrom
jlhawn:update_container_wait

jlhawn commented Mar 30, 2017 •

edited

Loading

Uh oh!

tonistiigi commented Mar 30, 2017

Uh oh!

WeiZhang555 commented Mar 31, 2017

Uh oh!

cpuguy83 commented Mar 31, 2017

Uh oh!

WeiZhang555 commented Mar 31, 2017

Uh oh!

jlhawn commented Mar 31, 2017

Uh oh!

jlhawn commented Mar 31, 2017 •

edited

Loading

Uh oh!

jlhawn Mar 31, 2017 •

edited

Loading

Uh oh!

dnephin left a comment

Uh oh!

jlhawn commented May 16, 2017

Uh oh!

thaJeztah commented May 16, 2017

Uh oh!

thaJeztah commented May 17, 2017

Uh oh!

jlhawn commented May 17, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Comments

Conversation

jlhawn commented Mar 30, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tonistiigi commented Mar 30, 2017

Uh oh!

WeiZhang555 commented Mar 31, 2017

Uh oh!

cpuguy83 commented Mar 31, 2017

Uh oh!

WeiZhang555 commented Mar 31, 2017

Uh oh!

jlhawn commented Mar 31, 2017

Uh oh!

jlhawn commented Mar 31, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jlhawn Mar 31, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dnephin left a comment

Choose a reason for hiding this comment

Uh oh!

jlhawn commented May 16, 2017

Uh oh!

thaJeztah commented May 16, 2017

Uh oh!

thaJeztah commented May 17, 2017

Uh oh!

jlhawn commented May 17, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

jlhawn commented Mar 30, 2017 •

edited

Loading

jlhawn commented Mar 31, 2017 •

edited

Loading

jlhawn Mar 31, 2017 •

edited

Loading