From 49179849ead03c6b95a9c6c81a0be759b8daff13 Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Tue, 25 Aug 2015 13:03:35 -0700 Subject: [PATCH] Remove "...already being pulled" messages These don't get seen, so they are unnecessary. Signed-off-by: Aaron Lehmann Upstream-commit: 9b9d70ad271b46a67bde57b8a807121f6e85b75f Component: engine --- components/engine/graph/pull_v1.go | 2 -- components/engine/graph/pull_v2.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/components/engine/graph/pull_v1.go b/components/engine/graph/pull_v1.go index d36e9b712a..13741292fd 100644 --- a/components/engine/graph/pull_v1.go +++ b/components/engine/graph/pull_v1.go @@ -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 { diff --git a/components/engine/graph/pull_v2.go b/components/engine/graph/pull_v2.go index afbda480ce..96f47b873a 100644 --- a/components/engine/graph/pull_v2.go +++ b/components/engine/graph/pull_v2.go @@ -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))