Skip to content

slack-vitess-r14.0.5-dsdefense: txthrottler: further code cleanup (#12902)#97

Merged
timvaillancourt merged 1 commit intoslack-vitess-r14.0.5-dsdefensefrom
pr-12902-slack-vitess-r14.0.5-dsdefense
Jul 3, 2023
Merged

slack-vitess-r14.0.5-dsdefense: txthrottler: further code cleanup (#12902)#97
timvaillancourt merged 1 commit intoslack-vitess-r14.0.5-dsdefensefrom
pr-12902-slack-vitess-r14.0.5-dsdefense

Conversation

@timvaillancourt
Copy link

@timvaillancourt timvaillancourt commented Jun 28, 2023

Description

Backport vitessio#12902. Some (but not all) of this PR was already backported by a previous upstream PR that was "ahead" of this one - I'm guessing some of the changes were missed in cherry-pick conflict resolution

Related Issue(s)

vitessio#12902

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

Deployment Notes

* txthrottler: further code cleanup

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Fix bad merge resolution

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt timvaillancourt requested a review from a team as a code owner June 28, 2023 17:34
Copy link

@ejortegau ejortegau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, though some tests failed. I set them to run again.

@timvaillancourt timvaillancourt merged commit a67fd1c into slack-vitess-r14.0.5-dsdefense Jul 3, 2023
@timvaillancourt timvaillancourt deleted the pr-12902-slack-vitess-r14.0.5-dsdefense branch July 3, 2023 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants