mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Run the remote image presence checks in parallel
Signed-off-by: Ian Calvert <ianjcalvert@gmail.com>
This commit is contained in:
parent
044d979f4e
commit
90c5ff4f06
1 changed files with 23 additions and 6 deletions
|
@ -113,18 +113,35 @@ func (s *TagStore) pushRepository(r *registry.Session, out io.Writer, repoInfo *
|
||||||
if tag == "" {
|
if tag == "" {
|
||||||
nTag = len(localRepo)
|
nTag = len(localRepo)
|
||||||
}
|
}
|
||||||
|
completed := make(chan bool)
|
||||||
|
needsPush := make([]bool, len(imgList))
|
||||||
for _, ep := range repoData.Endpoints {
|
for _, ep := range repoData.Endpoints {
|
||||||
out.Write(sf.FormatStatus("", "Pushing repository %s (%d tags)", repoInfo.CanonicalName, nTag))
|
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 {
|
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)
|
log.Errorf("Error in LookupRemoteImage: %s", err)
|
||||||
if _, err := s.pushImage(r, out, imgId, ep, repoData.Tokens, sf); err != nil {
|
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?
|
// FIXME: Continue on error?
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
out.Write(sf.FormatStatus("", "Image %s already pushed, skipping", utils.TruncateID(imgId)))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tag := range tagsByImage[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))
|
out.Write(sf.FormatStatus("", "Pushing tag for rev [%s] on {%s}", utils.TruncateID(imgId), ep+"repositories/"+repoInfo.RemoteName+"/tags/"+tag))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue