mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-05-26 01:39:26 +00:00
963d78dfcc
Fixes the deadlock noted by the "TODO this function will hang if it's called twice" markers in Tree.Disable and Tree.Rebuild. Both paths walk every layer in the tree and unconditionally invoke stopGeneration on each disk layer, so a layer reachable through both must tolerate a second call. The previous implementation sent on the unbuffered genAbort channel whenever genMarker was non-nil. After the first abort handshake the generator goroutine exits, but genMarker is only cleared on the successful-completion path (generate.go), not on the aborted-mid-flight path. A second stopGeneration therefore saw generating=true, sent on genAbort with no receiver, and blocked forever. Wrap the abort handshake in a sync.Once on the disk layer. The first call drives the handshake exactly as before; subsequent calls are no-ops. Remove both TODO comments now that the contract is honoured. Adds TestStopGenerationIdempotent: stands in a mock generator goroutine that consumes a single abort, calls stopGeneration twice, and fails with an explicit message at a 5s deadline rather than hanging until the test runner's outer timeout. Fixes #33233. |
||
|---|---|---|
| .. | ||
| context.go | ||
| conversion.go | ||
| difflayer.go | ||
| difflayer_test.go | ||
| disklayer.go | ||
| disklayer_test.go | ||
| generate.go | ||
| generate_test.go | ||
| holdable_iterator.go | ||
| holdable_iterator_test.go | ||
| iterator.go | ||
| iterator_binary.go | ||
| iterator_fast.go | ||
| iterator_test.go | ||
| journal.go | ||
| metrics.go | ||
| snapshot.go | ||
| snapshot_test.go | ||
| utils.go | ||