Merge planner part 2: gRPCs#6310
Merged
nadav-govari merged 2 commits intonadav/feature-split-mergesfrom Apr 16, 2026
Merged
Conversation
nadav-govari
commented
Apr 15, 2026
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.
Description
Part 2 of the merge planner changes: serving gRPC requests from workers.
On initialization, wait 2 intervals (10 total seconds) to receive status updates from workers on ongoing merges, to seed the in-progress state.
On receiving a request from a worker, clear successful and failed tasks, and remove the splits from the known pool.
Return as many queued merges as there are available slots. Returning 0 is fine.
The rest of the actual logic for this stuff was implemented in part 1, which contained the planner state.
How was this PR tested?
Unit tests.