builder: fix long stream sync #35404
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
dnephin
approved these changes
Nov 3, 2017
builder/dockerfile/builder.go
Outdated
| @@ -131,10 +131,10 @@ func (bm *BuildManager) initializeClientSession(ctx context.Context, cancel func | |||
| } | |||
| logrus.Debug("client is session enabled") | |||
|
|
|||
| ctx, cancelCtx := context.WithTimeout(ctx, sessionConnectTimeout) | |||
| sessionCtx, cancelCtx := context.WithTimeout(ctx, sessionConnectTimeout) | |||
There was a problem hiding this comment.
maybe connectCtx since the context is for connect, but other session calls below use the original ctx. sessionCtx seems misleading
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
|
Sorry, I'm not really familiar with Docker's development timeline yet - when exactly can I get to try the fix out? I would really like to be working with this as soon as possible |
tonistiigi
force-pushed
the
stream-ctx-fix
branch
from
25b60a8 to
c6703b7
Compare
|
@delissonjunio After it gets merged, depending on what priority is assigned to the issue it may get backported to affected releases. If not, it will end up either in |
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.
fixes #35391
The 5 second timeout should only count for the time it takes to connect to the session, not for the actual transfer.
Signed-off-by: Tonis Tiigi tonistiigi@gmail.com