Fix #4324 by switching io_context in merge, also reduce contact with app #4329
Conversation
This file contains 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
| using task_t = std::packaged_task<std::shared_ptr<Bucket>()>; | ||
| std::shared_ptr<task_t> task = std::make_shared<task_t>( | ||
| [curr, snap, &bm, shadows, maxProtocolVersion, countMergeEvents, level, | ||
| &timer, &app]() mutable { | ||
| &timer, &ctx, doFsync, availableTime]() mutable { |
There was a problem hiding this comment.
I don't mind this change, but I think a deeper refactor is needed here. We still capture BM which can access the app under the hood. That's probably out of scope for this PR, so we can merge as-is.
marta-lokhova
approved these changes
May 22, 2024
|
r+ 2abb588 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 appears to fix (at least by my local testing) the race in bug #4324