docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow multiple clients to pull the same tag simultaneously 

If two clients simultaneously try to pull the same tag, there was a race
whereby one would succeed and the second would generate an error. Now,
the second simply waits for the first to complete.
This commit is contained in:
Danny Yates 2013-11-27 12:18:01 +00:00
parent 6344e6f258
commit ae474e05f5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server.go
View File

@ -985,8 +985,14 @@ func (srv *Server) ImagePull(localName string, tag string, out io.Writer, sf *ut
if err != nil { if err != nil {
return err return err
} }
if _, err := srv.poolAdd("pull", localName+":"+tag); err != nil {
return err out = utils.NewWriteFlusher(out)
if c, err := srv.poolAdd("pull", localName+":"+tag); err != nil {
// Another pull of the same repository is already taking place; just wait for it to finish
out.Write(sf.FormatStatus("", "Repository %s already being pulled by another client. Waiting.", localName))
<-c
return nil
} }
defer srv.poolRemove("pull", localName+":"+tag) defer srv.poolRemove("pull", localName+":"+tag)
@ -1001,7 +1007,6 @@ func (srv *Server) ImagePull(localName string, tag string, out io.Writer, sf *ut
localName = remoteName localName = remoteName
} }
out = utils.NewWriteFlusher(out)
err = srv.pullRepository(r, out, localName, remoteName, tag, endpoint, sf, parallel) err = srv.pullRepository(r, out, localName, remoteName, tag, endpoint, sf, parallel)
if err == registry.ErrLoginRequired { if err == registry.ErrLoginRequired {
return err return err