toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove "...already being pulled" messages

Browse Source 
These don't get seen, so they are unnecessary.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9b9d70ad271b46a67bde57b8a807121f6e85b75f
Component: engine
This commit is contained in:
Aaron Lehmann
2015-08-27 13:22:08 -07:00
parent d4bbf5d640
commit 49179849ea
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/graph/pull_v1.go
-2
View File
@@ -140,7 +140,6 @@ func (p *v1Puller) pullRepository(askedTag string) error {
// ensure no two downloads of the same image happen at the same time
broadcaster, found := p.poolAdd("pull", "img:"+img.ID)
if found {
out.Write(p.sf.FormatProgress(stringid.TruncateID(img.ID), "Layer already being pulled by another client. Waiting.", nil))
broadcaster.Add(out)
broadcaster.Wait()
out.Write(p.sf.FormatProgress(stringid.TruncateID(img.ID), "Download complete", nil))
@@ -248,7 +247,6 @@ func (p *v1Puller) pullImage(out io.Writer, imgID, endpoint string, token []stri
broadcaster, found := p.poolAdd("pull", "layer:"+id)
if found {
logrus.Debugf("Image (id: %s) pull is already running, skipping", id)
out.Write(p.sf.FormatProgress(stringid.TruncateID(imgID), "Layer already being pulled by another client. Waiting.", nil))
broadcaster.Add(out)
broadcaster.Wait()
} else {
components/engine/graph/pull_v2.go
-2
View File
@@ -76,7 +76,6 @@ func (p *v2Puller) pullV2Repository(tag string) (err error) {
broadcaster, found := p.poolAdd("pull", taggedName)
if found {
// Another pull of the same repository is already taking place; just wait for it to finish
p.config.OutStream.Write(p.sf.FormatStatus("", "Repository %s already being pulled by another client. Waiting.", p.repoInfo.CanonicalName))
broadcaster.Add(p.config.OutStream)
broadcaster.Wait()
return nil
@@ -122,7 +121,6 @@ func (p *v2Puller) download(di *downloadInfo) {
broadcaster, found := p.poolAdd("pull", "img:"+di.img.ID)
if found {
out.Write(p.sf.FormatProgress(stringid.TruncateID(di.img.ID), "Layer already being pulled by another client. Waiting.", nil))
broadcaster.Add(out)
broadcaster.Wait()
out.Write(p.sf.FormatProgress(stringid.TruncateID(di.img.ID), "Download complete", nil))