Skip to content

Commit

Permalink
Revert "core/bloombits: fix deadlock when matcher session hits an err…
Browse files Browse the repository at this point in the history
…or (ethereum#28184)"

This reverts commit 0e3ba93.
  • Loading branch information
devopsbo3 authored Nov 10, 2023
1 parent 5f75d53 commit b45a7bf
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions core/bloombits/matcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -630,16 +630,13 @@ func (s *MatcherSession) Multiplex(batch int, wait time.Duration, mux chan chan
request <- &Retrieval{Bit: bit, Sections: sections, Context: s.ctx}

result := <-request

// Deliver a result before s.Close() to avoid a deadlock
s.deliverSections(result.Bit, result.Sections, result.Bitsets)

if result.Error != nil {
s.errLock.Lock()
s.err = result.Error
s.errLock.Unlock()
s.Close()
}
s.deliverSections(result.Bit, result.Sections, result.Bitsets)
}
}
}

0 comments on commit b45a7bf

Please sign in to comment.