dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure unlock occurs on panic in reader

This commit is contained in:
Matt Joiner 2022-03-31 17:04:36 +11:00
parent dd1ca6f514
commit a22150ab61
No known key found for this signature in database
GPG Key ID: 6B990B8185E7F782
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
reader.go
View File

@ -246,23 +246,28 @@ func (r *reader) readOnceAt(ctx context.Context, b []byte, pos int64) (n int, er
return
}
r.t.cl.lock()
// TODO: Just reset pieces in the readahead window. This might help
// prevent thrashing with small caches and file and piece priorities.
r.log(log.Fstr("error reading torrent %s piece %d offset %d, %d bytes: %v",
r.t.infoHash.HexString(), firstPieceIndex, firstPieceOffset, len(b1), err))
if !r.t.updatePieceCompletion(firstPieceIndex) {
r.log(log.Fstr("piece %d completion unchanged", firstPieceIndex))
}
// Update the rest of the piece completions in the readahead window, without alerting to
// changes (since only the first piece, the one above, could have generated the read error
// we're currently handling).
if r.pieces.begin != firstPieceIndex {
panic(fmt.Sprint(r.pieces.begin, firstPieceIndex))
}
for index := r.pieces.begin + 1; index < r.pieces.end; index++ {
r.t.updatePieceCompletion(index)
}
r.t.cl.unlock()
// I think there's a panic here caused by the Client being closed before obtaining this
// lock. TestDropTorrentWithMmapStorageWhileHashing seems to tickle occasionally in CI.
func() {
// Just add exceptions already.
defer r.t.cl.unlock()
// TODO: Just reset pieces in the readahead window. This might help
// prevent thrashing with small caches and file and piece priorities.
r.log(log.Fstr("error reading torrent %s piece %d offset %d, %d bytes: %v",
r.t.infoHash.HexString(), firstPieceIndex, firstPieceOffset, len(b1), err))
if !r.t.updatePieceCompletion(firstPieceIndex) {
r.log(log.Fstr("piece %d completion unchanged", firstPieceIndex))
}
// Update the rest of the piece completions in the readahead window, without alerting to
// changes (since only the first piece, the one above, could have generated the read error
// we're currently handling).
if r.pieces.begin != firstPieceIndex {
panic(fmt.Sprint(r.pieces.begin, firstPieceIndex))
}
for index := r.pieces.begin + 1; index < r.pieces.end; index++ {
r.t.updatePieceCompletion(index)
}
}()
}
}