Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-15.0] vtgate/engine: Fix race condition in join logic (#14435) #14438

Closed
wants to merge 1 commit into from

Conversation

vitess-bot[bot]
Copy link
Contributor

@vitess-bot vitess-bot bot commented Nov 2, 2023

Description

This is a backport of #14435

@vitess-bot vitess-bot bot added Backport This is a backport Component: Query Serving Merge Conflict Skip CI Skip CI actions from running Type: Bug labels Nov 2, 2023
Copy link
Contributor Author

vitess-bot bot commented Nov 2, 2023

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

  • Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

  • Apply the release notes (needs details) label if users need to know about this change.
  • New features should be documented.
  • There should be some code comments as to why things are implemented the way they are.
  • There should be a comment at the top of each new or modified test to explain what the test does.

New flags

  • Is this flag really necessary?
  • Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
  • vtctl command output order should be stable and awk-able.

Copy link
Contributor Author

vitess-bot bot commented Nov 2, 2023

Hello @dbussink, there are conflicts in this backport.

Please address them in order to merge this Pull Request. You can execute the snippet below to reset your branch and resolve the conflict manually.

Make sure you replace origin by the name of the vitessio/vitess remote

git fetch --all
gh pr checkout 14438 -R vitessio/vitess
git reset --hard origin/release-15.0
git cherry-pick -m 1 369b6a1e55aecd98c3cf6d4366cfbcee0477c474

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
@dbussink dbussink force-pushed the backport-14435-to-release-15.0 branch from 8f00046 to eeeeb3e Compare November 2, 2023 20:44
@dbussink dbussink removed Skip CI Skip CI actions from running Merge Conflict labels Nov 2, 2023
@dbussink dbussink marked this pull request as ready for review November 2, 2023 20:44
@dbussink dbussink requested a review from systay as a code owner November 2, 2023 20:44
@dbussink
Copy link
Contributor

dbussink commented Nov 4, 2023

v15 is EOL.

@dbussink dbussink closed this Nov 4, 2023
@dbussink dbussink deleted the backport-14435-to-release-15.0 branch November 4, 2023 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant