Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

core/bloombits: avoid crash when storing errors of different type #23437

Merged
merged 2 commits into from Aug 24, 2021
Merged

core/bloombits: avoid crash when storing errors of different type #23437

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa2d6f6
Removes the atomic.Value use for errors; introduces a lock + error va…
otherview Aug 23, 2021
1808182
Removes the atomic.Value use for errors; introduces a lock + error va…
otherview Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 10 additions & 7 deletions core/bloombits/matcher.go
View file
Open in desktop
Expand Up @@ -510,8 +510,9 @@ type MatcherSession struct {
closer sync.Once // Sync object to ensure we only ever close once
quit chan struct{} // Quit channel to request pipeline termination

ctx context.Context // Context used by the light client to abort filtering
err atomic.Value // Global error to track retrieval failures deep in the chain
ctx context.Context // Context used by the light client to abort filtering
err error // Global error to track retrieval failures deep in the chain
errLock sync.Mutex

pend sync.WaitGroup
}
Expand All @@ -529,10 +530,10 @@ func (s *MatcherSession) Close() {

// Error returns any failure encountered during the matching session.
func (s *MatcherSession) Error() error {
if err := s.err.Load(); err != nil {
return err.(error)
}
return nil
s.errLock.Lock()
defer s.errLock.Unlock()

return s.err
}

// allocateRetrieval assigns a bloom bit index to a client process that can either
Expand Down Expand Up @@ -630,7 +631,9 @@ func (s *MatcherSession) Multiplex(batch int, wait time.Duration, mux chan chan

result := <-request
if result.Error != nil {
s.err.Store(result.Error)
s.errLock.Lock()
s.err = result.Error
s.errLock.Unlock()
s.Close()
}
s.deliverSections(result.Bit, result.Sections, result.Bitsets)
Expand Down