TrueCloudLab/distribution
13
0
Fork 3
Code Issues 2 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #766 from noxiouz/fix_possible_goroutine_leak

Browse source 
[Client] Fix possible goroutine leak in pull
This commit is contained in:
Olivier Gambier 2014-11-20 16:41:48 -08:00
commit b7190a1e70
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client/pull.go
View file

@ -36,6 +36,11 @@ func Pull(c Client, objectStore ObjectStore, name, tag string) error {
errChans[i] = make(chan error) errChans[i] = make(chan error)
} }
// To avoid leak of goroutines we must notify
// pullLayer goroutines about a cancelation,
// otherwise they will lock forever.
cancelCh := make(chan struct{})
// Iterate over each layer in the manifest, simultaneously pulling no more // Iterate over each layer in the manifest, simultaneously pulling no more
// than simultaneousLayerPullWindow layers at a time. If an error is // than simultaneousLayerPullWindow layers at a time. If an error is
// received from a layer pull, we abort the push. // received from a layer pull, we abort the push.
@ -45,13 +50,17 @@ func Pull(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("Pull aborted") log.WithField("error", err).Warn("Pull 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] <- pullLayer(c, objectStore, name, manifest.FSLayers[i]) select {
case errChans[i] <- pullLayer(c, objectStore, name, manifest.FSLayers[i]):
case <-cancelCh: // no chance to recv until cancelCh's closed
}
}(i) }(i)
} }
} }