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

wait on pull from another client

Browse Source 
Upstream-commit: fb810b54ff404e81bd2486a944e24583a55fe8bf
Component: engine
This commit is contained in:
Victor Vieux
2013-12-05 14:41:56 -08:00
parent 754f4c422f
commit 1181340954
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/server.go
+8 -2
View File
@@ -877,8 +877,14 @@ func (srv *Server) pullRepository(r *registry.Registry, out io.Writer, localName
}
// ensure no two downloads of the same image happen at the same time
if _, err := srv.poolAdd("pull", "img:"+img.ID); err != nil {
utils.Errorf("Image (id: %s) pull is already running, skipping: %v", img.ID, err)
if c, err := srv.poolAdd("pull", "img:"+img.ID); err != nil {
if c != nil {
out.Write(sf.FormatProgress(utils.TruncateID(img.ID), "Layer already being pulled by another client. Waiting.", nil))
<-c
out.Write(sf.FormatProgress(utils.TruncateID(img.ID), "Download complete", nil))
} else {
utils.Errorf("Image (id: %s) pull is already running, skipping: %v", img.ID, err)
}
if parallel {
errors <- nil
}