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.
The main problem was that we now do a full DemoteMaster on the old master, even in the case of TER, as long as
disable_active_reparent
is false. This takes a lot longer (because shutting down the queryservice takes 30s before in-progress transactions are cancelled), so the test was timing out at a couple different levels (contexts and waiting for vtgate to find enough healthy tablets).This fixes the test by fixing the timeouts, but I think we should also avoid doing a full DemoteMaster in the case of TER. I'll optimize that in a future PR though. For now, let's at least get the tests green.