[8.0] modelindexer: Reduce locking on flushActive (backport #7649)#7661
Merged
Conversation
This patch unlocks the `i.activeMu` mutex in flushActive as soon as the `i.active` reference has been set to `nil`. This severely minimizes the lock contention and achives similar or higher indexing throughput when comparing the benchmarks before #7352 was introduced. The microbenchmark results seem to indicate that we're back to the previous indexing performance with this change: ```console $ go test -bench ... # Current main goos: darwin goarch: arm64 pkg: github.com/elastic/apm-server/model/modelindexer BenchmarkModelIndexer/NoCompression-8 4653790 2527 ns/op BenchmarkModelIndexer/BestSpeed-8 2909288 4051 ns/op BenchmarkModelIndexer/DefaultCompression-8 1691677 6674 ns/op BenchmarkModelIndexer/BestCompression-8 1234953 8334 ns/op PASS ok github.com/elastic/apm-server/model/modelindexer 70.585s ``` ```console $ go test -bench ... # This patch goos: darwin goarch: arm64 pkg: github.com/elastic/apm-server/model/modelindexer BenchmarkModelIndexer/NoCompression-8 8702388 1344 ns/op BenchmarkModelIndexer/BestSpeed-8 5097385 2238 ns/op BenchmarkModelIndexer/DefaultCompression-8 2639126 4821 ns/op BenchmarkModelIndexer/BestCompression-8 1586126 7350 ns/op PASS ok github.com/elastic/apm-server/model/modelindexer 64.933s ``` The contention is much worse when the APM Server is actually running and indexing against an Elasticsearch cluster since the lock is held for the entire `bulkIndexer.Flush` operation, which includes network latency. Signed-off-by: Marc Lopez Rubio <marc5.12@outlook.com> (cherry picked from commit b951097) # Conflicts: # changelogs/head.asciidoc
mergify
Bot
added
the
conflicts
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
🤖 GitHub commentsTo re-run your PR in the CI, just comment with:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #7649 done by Mergify.
Cherry-pick of b951097 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com