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

vtctldclient: Apply tablet type filtering for keyspace+shard in GetTablets #14467

Merged
merged 3 commits into from
Nov 5, 2023

Conversation

mattlord
Copy link
Contributor

@mattlord mattlord commented Nov 4, 2023

Description

You can filter tablets by keyspace, shard, and tablet-type with the GetTablets command.

There is a different path taken when keyspace and shard are both specified, however, and in that path the tablet type filtering was not done. This PR corrects that and applies the tablet type filtering everywhere if requested.

Related Issue(s)

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

Copy link
Contributor

vitess-bot bot commented Nov 4, 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.

@vitess-bot vitess-bot bot added 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 Nov 4, 2023
@github-actions github-actions bot added this to the v19.0.0 milestone Nov 4, 2023
@mattlord mattlord added Backport to: release-18.0 and removed NeedsWebsiteDocsUpdate What it says NeedsIssue A linked issue is missing for this Pull Request labels Nov 4, 2023
@mattlord mattlord requested a review from deepthi November 4, 2023 16:17
@mattlord mattlord marked this pull request as ready for review November 4, 2023 16:18
@mattlord mattlord added Type: Bug Component: CLI Component: vtctldclient and removed NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work Component: CLI labels Nov 4, 2023
@deepthi deepthi merged commit cfe88e6 into vitessio:main Nov 5, 2023
116 of 119 checks passed
@deepthi deepthi deleted the gettablets_filtering branch November 5, 2023 20:39
vitess-bot pushed a commit that referenced this pull request Nov 5, 2023
mattlord added a commit that referenced this pull request Nov 8, 2023
…+shard in GetTablets (#14467) (#14470)

Signed-off-by: Matt Lord <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Matt Lord <[email protected]>
@@ -2016,6 +2018,9 @@ func (s *VtctldServer) GetTablets(ctx context.Context, req *vtctldatapb.GetTable

tablets := make([]*topodatapb.Tablet, 0, len(tabletMap))
for _, ti := range tabletMap {
if req.TabletType != 0 && ti.Type != req.TabletType {
Copy link
Contributor

Choose a reason for hiding this comment

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

why is this 0 and not UNKNOWN?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Only because I copied the existing check/filter that was already used elsewhere in the function.🙂 I wish that I had changed both locations instead though. Whomever changes this file next should do that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Since it's a non-functional change I snuck it in here:
459a27b

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.

Bug Report: vtctldclient GetTablets shard filtering ignores tablet-type filtering
4 participants