浏览代码

Remove "...already being pulled" messages

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

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Aaron Lehmann 10 年之前
父节点
当前提交
9b9d70ad27
共有 2 个文件被更改,包括 0 次插入4 次删除
  1. 0 2
      graph/pull_v1.go
  2. 0 2
      graph/pull_v2.go

+ 0 - 2
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 {

+ 0 - 2
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))