slack-vitess-r15.0.5: backport required Transaction Throttler PRs, pt. 3 + ci fixes
#351
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
…essio#13153) Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
…itessio#13512) Signed-off-by: Eng Zer Jun <engzerjun@gmail.com> Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Co-authored-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
…lls` is undefined (vitessio#12477) Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> Co-authored-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com> Signed-off-by: Eduardo J. Ortega U. <5791035+ejortegau@users.noreply.github.com>
…vitessio#13624) Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: deepthi <deepthi@planetscale.com>
…ssio#14445) Signed-off-by: deepthi <deepthi@planetscale.com>
Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
timvaillancourt
added
upstream-backport
|
Thanks for the contribution! Before we can merge this, we need @Juneezee @deepthi to sign the Salesforce Inc. Contributor License Agreement. |
|
Thanks for the contribution! Before we can merge this, we need @deepthi to sign the Salesforce Inc. Contributor License Agreement. |
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
|
This PR should fix the problems with the |
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
|
This commit should fix the incompatibilities due to |
timvaillancourt
commented
May 21, 2024
| // 2 used to be io_thread_running. Instead io_state is used. | ||
| // 3 used to be sql_thread_running. Instead sql_state is used. | ||
| reserved 2, 3; | ||
| bool io_thread_running = 2; |
There was a problem hiding this comment.
The deprecation of field 2 + 3 (v16) was reverted just to stop protojson returning unmarshalling errors. Nothing actually uses this value
timvaillancourt
changed the title
slack-vitess-r15.0.5: backport required Transaction Throttler PRs, pt. 3slack-vitess-r15.0.5: backport required Transaction Throttler PRs, pt. 3 + ci fixes
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
vmogilev
approved these changes
May 21, 2024
timvaillancourt
merged commit 4a92ae7
into
slack-vitess-r15.0.5
196 of 197 checks passed
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.
Description
Backports:
github.com/golang/mockwithgo.uber.org/mockvitessio/vitess#13512--tx-throttler-healthcheck-cellsis undefined vitessio/vitess#12477txthrottler: removetxThrottlerConfigstruct, rely ontabletenvvitessio/vitess#13624Flaky test fix: 2b0a28c - this fixes an unrecognized field error because v15 dropped the
io_thread_runningandsql_thread_runningfields - causing it to error unmarshalling v14 results. This commit restores the 2 xbools so unmarshalling passesRelated Issue(s)
Checklist
Deployment Notes