Skip to content

modelindexer: Reduce locking on flushActive #7649

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

Merged
marclop merged 4 commits into from
Mar 24, 2022
Merged

modelindexer: Reduce locking on flushActive #7649

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7c50ed
modelindexer: Reduce locking on flushActive
marclop Mar 24, 2022
53b2d46
Update changelog
marclop Mar 24, 2022
34380c4
Merge branch 'main' into b/modelindexer-reduce-activeLocked-lock-time
stuartnelson3 Mar 24, 2022
5d1b91c
Merge branch 'main' into b/modelindexer-reduce-activeLocked-lock-time
marclop Mar 24, 2022
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 @@ -13,6 +13,7 @@ https://github.com/elastic/apm-server/compare/8.1\...main[View commits]
[float]
==== Bug fixes
- Do not overwrite `service version` if no transaction/error/... specific `service.name` is given {pull}7281[7281]
- modelindexer: Fix indexing performance regression due to locking bug {pull}7649[7649]

[float]
==== Intake API Changes
Expand Down
2 changes: 1 addition & 1 deletion model/modelindexer/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,9 @@ func (i *Indexer) flushActive(ctx context.Context) error {
}()

i.activeMu.Lock()
defer i.activeMu.Unlock()
bulkIndexer := i.active
i.active = nil
i.activeMu.Unlock()
err := i.flush(ctx, bulkIndexer)
bulkIndexer.Reset()
i.available <- bulkIndexer
Expand Down