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

packetbeat/beater: prevent double close of pb.done #35324

Merged
merged 1 commit into from
May 4, 2023
Merged

packetbeat/beater: prevent double close of pb.done #35324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
packetbeat/beater: prevent double close of pb.done 
In some circumstances when a managed instance of packetbeat is restarted
Stop will panic with close of closed channel. This appears to be
happening because on reload the sniffer may have returned an error,
closing pb.done. If the packetbeat instance is then stopped done is
closed a second time. So ensure that all closes are protected by
pb.stopOnce.
  • Loading branch information
@efd6
efd6 committed May 4, 2023
commit 6259d2324785589ad77deb4befb0dc2444edab6e
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ automatic splitting at root level, if root level element is an array. {pull}3415

*Packetbeat*

- Fix double channel close panic when reloading. {pull}35324[35324]

*Winlogbeat*

Expand Down
4 changes: 2 additions & 2 deletions packetbeat/beater/packetbeat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func (pb *packetbeat) runStatic(b *beat.Beat, factory *processorFactory) error {
select {
case <-pb.done:
case err := <-factory.err:
close(pb.done)
pb.stopOnce.Do(func() { close(pb.done) })
return err
}
return nil
Expand Down Expand Up @@ -187,7 +187,7 @@ func (pb *packetbeat) runManaged(b *beat.Beat, factory *processorFactory) error
// to stop if the sniffer(s) exited without an error
// this would happen during a configuration reload
if err != nil {
close(pb.done)
pb.stopOnce.Do(func() { close(pb.done) })
return err
}
}
Expand Down