fcrozat/distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Client] Fix possible goroutine leak in push.

Browse Source 
The same as 5a804ac05b
This commit is contained in:
Anton Tiurin 2014-11-21 11:20:16 +03:00
parent 1caf81bf5e
commit 2071422bea
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/push.go
View File

@ -36,6 +36,8 @@ func Push(c Client, objectStore ObjectStore, name, tag string) error {
errChans[i] = make(chan error) errChans[i] = make(chan error)
} }
cancelCh := make(chan struct{})
// Iterate over each layer in the manifest, simultaneously pushing no more // Iterate over each layer in the manifest, simultaneously pushing no more
// than simultaneousLayerPushWindow layers at a time. If an error is // than simultaneousLayerPushWindow layers at a time. If an error is
// received from a layer push, we abort the push. // received from a layer push, we abort the push.
@ -45,13 +47,17 @@ func Push(c Client, objectStore ObjectStore, name, tag string) error {
err := <-errChans[dependentLayer] err := <-errChans[dependentLayer]
if err != nil { if err != nil {
log.WithField("error", err).Warn("Push aborted") log.WithField("error", err).Warn("Push aborted")
close(cancelCh)
return err return err
} }
} }
if i < len(manifest.FSLayers) { if i < len(manifest.FSLayers) {
go func(i int) { go func(i int) {
errChans[i] <- pushLayer(c, objectStore, name, manifest.FSLayers[i]) select {
case errChans[i] <- pushLayer(c, objectStore, name, manifest.FSLayers[i]):
case <-cancelCh: // recv broadcast notification about cancelation
}
}(i) }(i)
} }
} }