drivers/docker: refactor use of clients in docker driver #17731
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shoenig
force-pushed
the
docker-max-kill-timeout
branch
from
4fcdace to
387f7f6
Compare
shoenig
force-pushed
the
docker-max-kill-timeout
branch
from
387f7f6 to
de01446
Compare
This PR refactors how we manage the two underlying clients used by the docker driver for communicating with the docker daemon. We keep two clients - one with a hard-coded timeout that applies to all operations no matter what, intended for use with short lived / async calls to docker. The other has no timeout and is the responsibility of the caller to set a context that will ensure the call eventually terminates. The use of these two clients has been confusing and mistakes were made in a number of places where calls were making use of the wrong client. This PR makes it so that a user must explicitly call a function to get the client that makes sense for that use case. Fixes #17023
shoenig
force-pushed
the
docker-max-kill-timeout
branch
from
de01446 to
185a374
Compare
shoenig
added
backport/1.3.x
This was referenced Jun 26, 2023
Merged
Merged
lgfa29
added a commit
that referenced
this pull request
Jul 19, 2023
lgfa29
added a commit
that referenced
this pull request
Jul 19, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR refactors how we manage the two underlying clients used by the
docker driver for communicating with the docker daemon. We keep two clients
One with a hard-coded timeout that applies to all operations no matter
what, intended for use with short lived / async calls to docker.
The other has no timeout and is the responsibility of the caller to set a
context that will ensure the call eventually terminates (except in the
.Waitcase).The use of these two clients has been confusing and mistakes were made
in a number of places where calls were making use of the wrong client.
This PR makes it so that a user must explicitly call a function to get
the client that makes sense for that use case.
Fixes #17023