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

Run the remote image presence checks in parallel

Browse Source 
Signed-off-by: Ian Calvert <ianjcalvert@gmail.com>
Upstream-commit: 90c5ff4f06b8672cd2b427d120a8988bfc9f1de7
Component: engine
This commit is contained in:
Ian Calvert
2014-12-17 22:17:14 +00:00
committed by Michael Crosby
parent 94b5bf5737
commit 1f4175ede8
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
components/engine/graph/push.go
View File

@ -113,18 +113,35 @@ func (s *TagStore) pushRepository(r *registry.Session, out io.Writer, repoInfo *
if tag == "" {
nTag = len(localRepo)
}
completed := make(chan bool)
needsPush := make([]bool, len(imgList))
for _, ep := range repoData.Endpoints {
out.Write(sf.FormatStatus("", "Pushing repository %s (%d tags)", repoInfo.CanonicalName, nTag))
for _, imgId := range imgList {
if err := r.LookupRemoteImage(imgId, ep, repoData.Tokens); err != nil {
log.Errorf("Error in LookupRemoteImage: %s", err)
if _, err := s.pushImage(r, out, imgId, ep, repoData.Tokens, sf); err != nil {
for i, imgId := range imgList {
go func(i int, imgId string) {
if err := r.LookupRemoteImage(imgId, ep, repoData.Tokens); err == nil {
out.Write(sf.FormatStatus("", "Image %s already pushed, skipping", utils.TruncateID(imgId)))
needsPush[i] = false
} else {
log.Errorf("Error in LookupRemoteImage: %s", err)
out.Write(sf.FormatStatus("", "Image %s not pushed, adding to queue", utils.TruncateID(imgId)))
needsPush[i] = true
}
completed <- true
}(i, imgId)
}
for i := 0; i < len(imgList); i++ {
<-completed
}
for i, imgId := range imgList {
if needsPush[i] {
if _, err := s.pushImage(r, out, remoteName, imgId, ep, repoData.Tokens, sf); err != nil {
// FIXME: Continue on error?
return err
}
} else {
out.Write(sf.FormatStatus("", "Image %s already pushed, skipping", utils.TruncateID(imgId)))
}
for _, tag := range tagsByImage[imgId] {
out.Write(sf.FormatStatus("", "Pushing tag for rev [%s] on {%s}", utils.TruncateID(imgId), ep+"repositories/"+repoInfo.RemoteName+"/tags/"+tag))