Rework merge task for both compactor and indexer merge flows#6464
Open
nadav-govari wants to merge 4 commits into
Open
Rework merge task for both compactor and indexer merge flows#6464nadav-govari wants to merge 4 commits into
nadav-govari wants to merge 4 commits into
Conversation
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
One thing that was done in the feature branch was reworking the MergeScratch used in the merge pipeline with an eye on deprecating MergeTask, since I thought that was going away. Since the existing flow stays for now, we need the merge task, which tracks merge permits per pipeline for the existing flow. So rework it into an enum thats either merge task or merge operation.
How was this PR tested?
Unit tests updated.