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

Protect ExecuteFetchAsDBA against multi-statements, excluding a sequence of CREATE TABLE|VIEW. #14954

Merged

Conversation

shlomi-noach
Copy link
Contributor

@shlomi-noach shlomi-noach commented Jan 15, 2024

Description

Addresses #14952 and to some extent #14949.

In this PR:

  • ExecuteFetchAsDBA generally rejects any multi-statement SQL. For example, the following returns an error:
vtctldclient ExecuteFetchAsDBA zone1-0000000100 "select 1 from dual; select 2 from dual"

Today, it is possible to send multiple queries in vtctldclient ExecuteFetchAsDBA. This potentially makes the connection pool dirty, as connections in the pool could have undrained result sets from previous calls.

Added tests.

This should be backported to:

  • v18 to fix ApplySchema --batch-size, as well as to fix the dirty connection pool issue.
  • v17 and v16 to fix the dirty connection pool issue.

Related Issue(s)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported to release branches
  • If this change is to be back-ported to previous releases, a justification is included in the PR description
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on CI?
  • Documentation was added or is not required

Deployment Notes

Copy link
Contributor

vitess-bot bot commented Jan 15, 2024

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.

@vitess-bot vitess-bot bot added NeedsBackportReason If backport labels have been applied to a PR, a justification is required NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsIssue A linked issue is missing for this Pull Request NeedsWebsiteDocsUpdate What it says labels Jan 15, 2024
@shlomi-noach shlomi-noach added Backport to: release-16.0 Backport to: release-18.0 Needs to be back ported to release-18.0 labels Jan 15, 2024
@github-actions github-actions bot added this to the v19.0.0 milestone Jan 15, 2024
@shlomi-noach
Copy link
Contributor Author

shlomi-noach commented Jan 15, 2024

This PR solves the issue for main, and for backports. Going forward, we will offer new RPC calls in v19, to completely replace the existing logic in v20.

@shlomi-noach
Copy link
Contributor Author

There's a coupe of tests running ExecuteFetchAsDBA with sequences of commands such as STOP SLAVE; RESET SLAVE ALL; RESET MASTER etc. Fixing those.

Copy link

codecov bot commented Jan 15, 2024

Codecov Report

Attention: 24 lines in your changes are missing coverage. Please review.

Comparison is base (eddb39e) 47.29% compared to head (20658c8) 47.25%.
Report is 9 commits behind head on main.

Files Patch % Lines
go/vt/vttablet/tabletmanager/rpc_query.go 58.69% 14 Missing and 5 partials ⚠️
go/vt/sqlparser/utils.go 78.57% 2 Missing and 1 partial ⚠️
go/vt/schemadiff/schema.go 33.33% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #14954      +/-   ##
==========================================
- Coverage   47.29%   47.25%   -0.05%     
==========================================
  Files        1137     1138       +1     
  Lines      238684   238898     +214     
==========================================
- Hits       112895   112883      -12     
- Misses     117168   117407     +239     
+ Partials     8621     8608      -13     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Shlomi Noach <[email protected]>
Signed-off-by: Shlomi Noach <[email protected]>
Signed-off-by: Shlomi Noach <[email protected]>
Signed-off-by: Shlomi Noach <[email protected]>
@shlomi-noach shlomi-noach removed NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsWebsiteDocsUpdate What it says NeedsIssue A linked issue is missing for this Pull Request labels Jan 16, 2024
@harshit-gangal harshit-gangal removed the NeedsBackportReason If backport labels have been applied to a PR, a justification is required label Jan 16, 2024
@shlomi-noach
Copy link
Contributor Author

Looking for a 2nd review 🙏

@shlomi-noach
Copy link
Contributor Author

Backporting was expected to have merge conflicts. Will fix one by one.

shlomi-noach added a commit that referenced this pull request Jan 18, 2024
…excluding a sequence of `CREATE TABLE|VIEW`. (#14954) (#14984)

Signed-off-by: Shlomi Noach <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Shlomi Noach <[email protected]>
shlomi-noach added a commit that referenced this pull request Jan 18, 2024
…excluding a sequence of `CREATE TABLE|VIEW`. (#14954) (#14983)

Signed-off-by: Shlomi Noach <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Shlomi Noach <[email protected]>
shlomi-noach added a commit that referenced this pull request Jan 18, 2024
…excluding a sequence of `CREATE TABLE|VIEW`. (#14954) (#14982)

Signed-off-by: Shlomi Noach <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Shlomi Noach <[email protected]>
notfelineit pushed a commit to planetscale/vitess that referenced this pull request Mar 12, 2024
…ecuteFetchAsDBA` against multi-statements, excluding a sequence of `CREATE TABLE|VIEW`. (vitessio#4166)

* backport of 4161

* resolve conflicts

Signed-off-by: Shlomi Noach <[email protected]>

---------

Signed-off-by: Shlomi Noach <[email protected]>
Co-authored-by: Shlomi Noach <[email protected]>
frouioui pushed a commit to planetscale/vitess that referenced this pull request Mar 26, 2024
…ecuteFetchAsDBA` against multi-statements, excluding a sequence of `CREATE TABLE|VIEW`. (vitessio#4163)

* backport of 4161

* resolve conflicts

Signed-off-by: Shlomi Noach <[email protected]>

---------

Signed-off-by: Shlomi Noach <[email protected]>
Co-authored-by: Shlomi Noach <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport to: release-18.0 Needs to be back ported to release-18.0 Breaking change Component: General Changes throughout the code base Component: TabletManager Type: Bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants