Repository navigation
minor: restore query ID verification in MSQ workers - #20530
Open
nanjeshramesh wants to merge 1 commit into
Open
nanjeshramesh wants to merge 1 commit into
nanjeshramesh wants to merge 1 commit into
Conversation
github-actions
Bot
added
Area - Batch Ingestion
Area - MSQ
nanjeshramesh
changed the title
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.
Fixes #16894.
Description
#16886 removed the query ID verification from MSQ workers because, until Druid 30, the query IDs of individual stages could be random UUIDs instead of the real query ID (fixed in #16168). A newer worker talking to a controller from one of those versions would then fail the check. The issue asks for the check to come back once Druid 34 is released, and the latest stable release is now 38, so this restores it.
WorkerImpl.KernelHolderschecks again that the query ID of a stage matches the worker's query ID when a kernel is added, finished, removed or looked up, using the sameverifyQueryIdhelper as before #16886. The note about the old bug that #16886 added to theStageIdJavadoc is removed.This is the inverse of #16886 applied to the current file location, so the check is exactly what it was before.
Key changed/added classes in this PR
WorkerImplStageIdI did not add a new test. The check runs on every stage of the existing end to end tests, and
WorkerImplTest,DartWorkerRunnerTest,RunWorkOrderTest,MSQSelectTest,MSQInsertTest,MSQFaultsTestandMSQWindowTestall pass with it (866 tests), with checkstyle clean.This PR has: