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

Finish fixing IP banning on storage errors

This commit is contained in:
Matt Joiner 2020-01-23 13:54:37 +11:00
parent 4fae1f81df
commit cf0d0118ea
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
connection.go
View File

@ -1404,7 +1404,10 @@ func (c *connection) receiveChunk(msg *pp.Message) error {
if t.pieceAllDirty(pieceIndex(req.Index)) { if t.pieceAllDirty(pieceIndex(req.Index)) {
t.queuePieceCheck(pieceIndex(req.Index)) t.queuePieceCheck(pieceIndex(req.Index))
t.pendAllChunkSpecs(pieceIndex(req.Index)) // We don't pend all chunks here anymore because we don't want code dependent on the dirty
// chunk status (such as the haveChunk call above) to have to check all the various other
// piece states like queued for hash, hashing etc. This does mean that we need to be sure
// that chunk pieces are pended at an appropriate time later however.
} }
cl.event.Broadcast() cl.event.Broadcast()

17
torrent.go
View File

@ -1532,8 +1532,8 @@ func (t *Torrent) SetMaxEstablishedConns(max int) (oldMax int) {
return oldMax return oldMax
} }
func (t *Torrent) pieceHashed(piece pieceIndex, correct bool) { func (t *Torrent) pieceHashed(piece pieceIndex, passed bool, hashIoErr error) {
t.logger.Log(log.Fstr("hashed piece %d (passed=%t)", piece, correct).WithValues(debugLogValue)) t.logger.Log(log.Fstr("hashed piece %d (passed=%t)", piece, passed).WithValues(debugLogValue))
p := t.piece(piece) p := t.piece(piece)
p.numVerifies++ p.numVerifies++
t.cl.event.Broadcast() t.cl.event.Broadcast()
@ -1543,7 +1543,7 @@ func (t *Torrent) pieceHashed(piece pieceIndex, correct bool) {
// Don't score the first time a piece is hashed, it could be an initial check. // Don't score the first time a piece is hashed, it could be an initial check.
if p.storageCompletionOk { if p.storageCompletionOk {
if correct { if passed {
pieceHashedCorrect.Add(1) pieceHashedCorrect.Add(1)
} else { } else {
log.Fmsg("piece %d failed hash: %d connections contributed", piece, len(p.dirtiers)).AddValues(t, p).Log(t.logger) log.Fmsg("piece %d failed hash: %d connections contributed", piece, len(p.dirtiers)).AddValues(t, p).Log(t.logger)
@ -1551,7 +1551,7 @@ func (t *Torrent) pieceHashed(piece pieceIndex, correct bool) {
} }
} }
if correct { if passed {
if len(p.dirtiers) != 0 { if len(p.dirtiers) != 0 {
// Don't increment stats above connection-level for every involved connection. // Don't increment stats above connection-level for every involved connection.
t.allStats((*ConnStats).incrementPiecesDirtiedGood) t.allStats((*ConnStats).incrementPiecesDirtiedGood)
@ -1564,14 +1564,17 @@ func (t *Torrent) pieceHashed(piece pieceIndex, correct bool) {
if err != nil { if err != nil {
t.logger.Printf("%T: error marking piece complete %d: %s", t.storage, piece, err) t.logger.Printf("%T: error marking piece complete %d: %s", t.storage, piece, err)
} }
t.pendAllChunkSpecs(piece)
} else { } else {
if len(p.dirtiers) != 0 && p.allChunksDirty() { if len(p.dirtiers) != 0 && p.allChunksDirty() && hashIoErr == nil {
// Peers contributed to all the data for this piece hash failure, and the failure was
// not due to errors in the storage (such as data being dropped in a cache).
// Increment Torrent and above stats, and then specific connections. // Increment Torrent and above stats, and then specific connections.
t.allStats((*ConnStats).incrementPiecesDirtiedBad) t.allStats((*ConnStats).incrementPiecesDirtiedBad)
for c := range p.dirtiers { for c := range p.dirtiers {
// Y u do dis peer?! // Y u do dis peer?!
c._stats.incrementPiecesDirtiedBad() c.stats().incrementPiecesDirtiedBad()
} }
bannableTouchers := make([]*connection, 0, len(p.dirtiers)) bannableTouchers := make([]*connection, 0, len(p.dirtiers))
@ -1698,7 +1701,7 @@ func (t *Torrent) pieceHasher(index pieceIndex) {
defer t.cl.unlock() defer t.cl.unlock()
p.hashing = false p.hashing = false
t.updatePiecePriority(index) t.updatePiecePriority(index)
t.pieceHashed(index, correct) t.pieceHashed(index, correct, copyErr)
t.publishPieceChange(index) t.publishPieceChange(index)
t.activePieceHashes-- t.activePieceHashes--
t.tryCreateMorePieceHashers() t.tryCreateMorePieceHashers()

2
torrent_test.go
View File

@ -157,7 +157,7 @@ func TestPieceHashFailed(t *testing.T) {
tt.cl.lock() tt.cl.lock()
tt.pieces[1]._dirtyChunks.AddRange(0, 3) tt.pieces[1]._dirtyChunks.AddRange(0, 3)
require.True(t, tt.pieceAllDirty(1)) require.True(t, tt.pieceAllDirty(1))
tt.pieceHashed(1, false) tt.pieceHashed(1, false, nil)
// Dirty chunks should be cleared so we can try again. // Dirty chunks should be cleared so we can try again.
require.False(t, tt.pieceAllDirty(1)) require.False(t, tt.pieceAllDirty(1))
tt.cl.unlock() tt.cl.unlock()