tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swarm/network/master: protect SetNextBatch iterator after close (#19147)

Browse Source
This commit is contained in:
Janoš Guljaš 2019-02-21 18:33:49 +01:00 committed by Viktor Trón
parent b9808e392f
commit 836c846812
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swarm/network/stream/stream.go
View File

@ -597,6 +597,16 @@ func (r *Registry) runProtocol(p *p2p.Peer, rw p2p.MsgReadWriter) error {
// HandleMsg is the message handler that delegates incoming messages // HandleMsg is the message handler that delegates incoming messages
func (p *Peer) HandleMsg(ctx context.Context, msg interface{}) error { func (p *Peer) HandleMsg(ctx context.Context, msg interface{}) error {
select {
case <-p.streamer.quit:
log.Trace("message received after the streamer is closed", "peer", p.ID())
// return without an error since streamer is closed and
// no messages should be handled as other subcomponents like
// storage leveldb may be closed
return nil
default:
}
switch msg := msg.(type) { switch msg := msg.(type) {
case *SubscribeMsg: case *SubscribeMsg:

5
swarm/network/stream/syncer.go
View File

@ -107,6 +107,11 @@ func (s *SwarmSyncerServer) SetNextBatch(from, to uint64) ([]byte, uint64, uint6
metrics.GetOrRegisterCounter("syncer.setnextbatch.iterator", nil).Inc(1) metrics.GetOrRegisterCounter("syncer.setnextbatch.iterator", nil).Inc(1)
err := s.store.Iterator(from, to, s.po, func(key storage.Address, idx uint64) bool { err := s.store.Iterator(from, to, s.po, func(key storage.Address, idx uint64) bool {
select {
case <-s.quit:
return false
default:
}
batch = append(batch, key[:]...) batch = append(batch, key[:]...)
i++ i++
to = idx to = idx