Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] backport pkg/progress: work around closing closed channel panic#55

Merged
tiborvass merged 1 commit intodocker-archive:18.09from
thaJeztah:18.09_backport_fix-progress-panic
Sep 17, 2018
Merged

[18.09] backport pkg/progress: work around closing closed channel panic#55
tiborvass merged 1 commit intodocker-archive:18.09from
thaJeztah:18.09_backport_fix-progress-panic

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

backport of moby#37780 for 18.09

git checkout -b 18.09_backport_fix-progress-panic ce-engine/18.09  
git cherry-pick -s -S -x 7dac70324d0ce6acd23458b0bef06f099837d648

cherry-pick was clean; no conflicts

I could not reproduce the panic in moby#37735, so here's a bandaid.

I could not reproduce the panic in moby#37735, so here's a bandaid.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 7dac703)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.09.0 milestone Sep 17, 2018
@thaJeztah
Copy link
Copy Markdown
Member Author

ping @tiborvass @tonistiigi PTAL

Copy link
Copy Markdown

@tiborvass tiborvass left a comment

Choose a reason for hiding this comment

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

LGTM

@tiborvass tiborvass merged commit c24fd7a into docker-archive:18.09 Sep 17, 2018
@thaJeztah thaJeztah deleted the 18.09_backport_fix-progress-panic branch September 18, 2018 16:43
thaJeztah added a commit to thaJeztah/cli that referenced this pull request Mar 27, 2019
relevant changes;

- moby/moby#38006 / docker-archive/engine#114 client: use io.LimitedReader for reading HTTP error
- moby/moby#38634 / docker-archive/engine#167 pkg/archive:CopyTo(): fix for long dest filename
  - fixes docker/for-linux#484 for 18.09
- moby/moby#38944 / docker-archive/engine#183 gitutils: add validation for ref
- moby/moby#37780 / docker-archive/engine#55 pkg/progress: work around closing closed channel panic
  - addresses moby/moby#/37735 pkg/progress: panic due to race on shutdown

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Mar 27, 2019
relevant changes;

- moby/moby#38006 / docker-archive/engine#114 client: use io.LimitedReader for reading HTTP error
- moby/moby#38634 / docker-archive/engine#167 pkg/archive:CopyTo(): fix for long dest filename
  - fixes docker/for-linux#484 for 18.09
- moby/moby#38944 / docker-archive/engine#183 gitutils: add validation for ref
- moby/moby#37780 / docker-archive/engine#55 pkg/progress: work around closing closed channel panic
  - addresses moby/moby#/37735 pkg/progress: panic due to race on shutdown

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 010c234a0d5a03d450ebec60be37dd9f279feeca
Component: cli
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants