tblyler/hoarder
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix download deadlock

Browse source
This commit is contained in:
Tony Blyler 2016-05-14 10:33:04 -04:00
parent 95ce7fccee
commit 93cf0597ed
No known key found for this signature in database
GPG key ID: 25C9D3A655D1A65C
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
queue/queue.go
View file

@ -236,7 +236,9 @@ func (q *Queue) downloadTorrents(torrents []rtorrent.Torrent) {
q.lock.RLock()
defer q.lock.RUnlock()
done := make(chan bool, q.config.ConcurrentDownloads)
// this will keep track of the torrent hashes that have finished
// will return an empty string on a failed download
done := make(chan string, q.config.ConcurrentDownloads)
var running uint
for _, torrent := range torrents {
if !torrent.Completed {
@ -251,7 +253,15 @@ func (q *Queue) downloadTorrents(torrents []rtorrent.Torrent) {
}
if running >= q.config.ConcurrentDownloads {
<-done
finishedHash := <-done
if finishedHash != "" {
q.lock.RUnlock()
q.lock.Lock()
delete(q.downloadQueue, finishedHash)
q.lock.Unlock()
q.lock.RLock()
}
running--
}
@ -282,7 +292,7 @@ func (q *Queue) downloadTorrents(torrents []rtorrent.Torrent) {
err := q.sftpClient.Mirror(torrent.Path, downloadPath)
if err != nil {
q.logger.Printf("Failed to download '%s' to '%s' error '%s'", torrent.Path, downloadPath, err)
done <- false
done <- ""
return
}
@ -294,7 +304,7 @@ func (q *Queue) downloadTorrents(torrents []rtorrent.Torrent) {
err = os.Rename(downFullPath, destFullPath)
if err != nil {
q.logger.Printf("Failed to move temp path '%s' to dest path '%s' error '%s'", downFullPath, destFullPath, err)
done <- false
done <- ""
return
}
}
@ -315,18 +325,20 @@ func (q *Queue) downloadTorrents(torrents []rtorrent.Torrent) {
q.logger.Printf("Successfully downloaded '%s' (%s)", torrent.Name, torrentFilePath)
q.lock.RUnlock()
q.lock.Lock()
delete(q.downloadQueue, torrent.Hash)
q.lock.Unlock()
q.lock.RLock()
done <- true
done <- torrent.Hash
}(torrentFilePath, downloadPath, torrent)
running++
}
for running > 0 {
<-done
finishedHash := <-done
if finishedHash != "" {
q.lock.RUnlock()
q.lock.Lock()
delete(q.downloadQueue, finishedHash)
q.lock.Unlock()
}
running--
}
}