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

rewrite shuffleTablets to be clearer and more efficient #15716

Merged
merged 2 commits into from
Apr 30, 2024

Conversation

demmer
Copy link
Member

@demmer demmer commented Apr 15, 2024

Description

Implement a simple single-pass scan through the list of tablets that both randomly shuffles the set and pulls the same-cell hosts to the front of the list.

This is the same functionality as the old code, just with a simpler algorithm that only needs to loop once through the set of tablets so it's a marginally more efficient approach.

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 Apr 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 Apr 15, 2024
@github-actions github-actions bot added this to the v20.0.0 milestone Apr 15, 2024
Copy link

codecov bot commented Apr 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.43%. Comparing base (f118ba2) to head (d43907a).
Report is 35 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #15716      +/-   ##
==========================================
+ Coverage   68.40%   68.43%   +0.03%     
==========================================
  Files        1556     1558       +2     
  Lines      195121   195957     +836     
==========================================
+ Hits       133479   134111     +632     
- Misses      61642    61846     +204     

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

@demmer demmer added Type: Internal Cleanup and 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 NeedsBackportReason If backport labels have been applied to a PR, a justification is required labels Apr 15, 2024
@deepthi
Copy link
Member

deepthi commented Apr 16, 2024

@demmer you need to signoff the commit and force-push.

@demmer
Copy link
Member Author

demmer commented Apr 16, 2024

@demmer you need to signoff the commit and force-push.

Oh right. My Vitess contribution skills are rusty!

Implement a simple single-pass scan through the list of tablets that both
randomly shuffles the set and pulls the same-cell hosts to the front of the list.

Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer demmer force-pushed the tabletgateway-improve-shuffle branch from 32ad8ca to 9f1e23a Compare April 17, 2024 00:40
@demmer
Copy link
Member Author

demmer commented Apr 17, 2024

@deepthi Pushed again with the Signed-Off.

Copy link
Member

@deepthi deepthi left a comment

Choose a reason for hiding this comment

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

Good to see you back :)

if sameCell < diffCell {
// fast forward the `sameCell` lookup to `diffCell + 1`, `diffCell` unchanged
sameCell = diffCell + 1
// Randomly shuffle the list of tablets, putting the same-cell hosts at the front
Copy link
Member

Choose a reason for hiding this comment

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

nit: I'd always use tablet/tablets instead of host/hosts. Those are the Vitess terms.

Copy link
Member Author

Choose a reason for hiding this comment

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

ok. edited.

Copy link
Member

@GuptaManan100 GuptaManan100 left a comment

Choose a reason for hiding this comment

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

Love it!

@deepthi
Copy link
Member

deepthi commented Apr 17, 2024

Let's give @demmer a chance to address feedback and then we can merge.

@deepthi
Copy link
Member

deepthi commented Apr 25, 2024

@demmer DCO failed again. I guess the latest commit hasn't been signed off properly.

Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer demmer force-pushed the tabletgateway-improve-shuffle branch from 0bed5c6 to d43907a Compare April 26, 2024 03:17
@demmer
Copy link
Member Author

demmer commented Apr 26, 2024 via email

@deepthi deepthi merged commit c154771 into vitessio:main Apr 30, 2024
104 checks passed
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.

3 participants