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

Limit badger gc concurrency to 1 to avoid panic #14340

Merged
merged 10 commits into from
Oct 21, 2024
Merged

Limit badger gc concurrency to 1 to avoid panic #14340

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eb9f610
Add mutex to avoid concurrent gc during hot reload
carsonip Oct 11, 2024
503f8cc
Add changelog
carsonip Oct 11, 2024
b18d34e
Improve comment
carsonip Oct 11, 2024
25e5b5d
Update changelog
carsonip Oct 11, 2024
f654fba
Add a subscriber file mutex
carsonip Oct 16, 2024
038ff5b
Use channel instead of mutex
carsonip Oct 16, 2024
4a04fc8
Merge branch 'main' into fix-tbs-in-hot-reload
carsonip Oct 16, 2024
b744adf
Add test
carsonip Oct 17, 2024
174df6d
Merge branch 'main' into fix-tbs-in-hot-reload
carsonip Oct 17, 2024
d6a23ad
Merge branch 'main' into fix-tbs-in-hot-reload
carsonip Oct 21, 2024
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
1 change: 1 addition & 0 deletions changelogs/head.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ https://github.com/elastic/apm-server/compare/8.15\...main[View commits]
==== Bug fixes

- Track all bulk request response status codes {pull}13574[13574]
- Tail-based sampling: Fix rare gc thread failure after EA hot reload, causing unbounded storage size growth {pull}13574[13574]

[float]
==== Breaking Changes
Expand Down
7 changes: 7 additions & 0 deletions x-pack/apm-server/sampling/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ const (
shutdownGracePeriod = 5 * time.Second
)

var (
// gcMutex is a global mutex to protect gc from running concurrently when 2 TBS processors are active during a hot reload
gcMutex sync.Mutex
)

// Processor is a tail-sampling event processor.
type Processor struct {
config Config
Expand Down Expand Up @@ -386,6 +391,8 @@ func (p *Processor) Run() error {
}
})
g.Go(func() error {
gcMutex.Lock()
defer gcMutex.Unlock()
// This goroutine is responsible for periodically garbage
// collecting the Badger value log, using the recommended
// discard ratio of 0.5.
Expand Down
Loading