Skip to content

txthrottler: filter topology watcher by shard#13062

Closed
timvaillancourt wants to merge 8 commits intovitessio:mainfrom
timvaillancourt:tx-throttler-topoWatcher-FilterByShard
Closed

txthrottler: filter topology watcher by shard#13062
timvaillancourt wants to merge 8 commits intovitessio:mainfrom
timvaillancourt:tx-throttler-topoWatcher-FilterByShard

Conversation

@timvaillancourt
Copy link
Copy Markdown
Contributor

@timvaillancourt timvaillancourt commented May 10, 2023 •
edited
Loading

Description

This PR filters the tablet watcher in txthrottler to return only tablets in the local shard because the Transaction Throttler has no need for the state of tablets in other shards

Related Issue(s)

Resolves #13068

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

@vitess-bot
Copy link
Copy Markdown
Contributor

vitess-bot bot commented May 10, 2023

Review Checklist

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

General

  • Ensure that the Pull Request has a descriptive title.
  • If this is a change that users need to know about, please apply the release notes (needs details) label so that merging is blocked unless the summary release notes document is included.
  • If a test is added or modified, there should be a documentation on top of the test to explain what the expected behavior is what the test does.

If a new flag is being introduced:

  • Is it really necessary to add this flag?
  • Flag names should be clear and intuitive (as far as possible)
  • Help text should be descriptive.
  • Flag names should use dashes (-) as word separators rather than underscores (_).

If a workflow is added or modified:

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

Bug fixes

  • There should be at least one unit or end-to-end test.
  • The Pull Request description should include a link to an issue that describes the bug.

Non-trivial changes

  • There should be some code comments as to why things are implemented the way they are.

New/Existing features

  • Should be documented, either by modifying the existing documentation or creating new documentation.
  • New features should have a link to a feature request issue or an RFC that documents the use cases, corner cases and test cases.

Backward compatibility

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

@vitess-bot vitess-bot bot added NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsWebsiteDocsUpdate What it says labels May 10, 2023
@github-actions github-actions bot added this to the v17.0.0 milestone May 10, 2023
@timvaillancourt
txthrottler: filter healthcheck stream by shard
d1fee85 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt timvaillancourt force-pushed the tx-throttler-topoWatcher-FilterByShard branch from 942cb6b to d1fee85 Compare May 10, 2023 16:09
@timvaillancourt timvaillancourt marked this pull request as ready for review May 10, 2023 16:09
@harshit-gangal harshit-gangal removed the NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work label May 16, 2023
harshit-gangal
harshit-gangal reviewed May 16, 2023
View reviewed changes
harshit-gangal
harshit-gangal reviewed May 16, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@harshit-gangal harshit-gangal left a comment

Choose a reason for hiding this comment

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

the changes look good. A test would be needed to validate the enhancement.

@harshit-gangal harshit-gangal added Type: Enhancement Logical improvement (somewhere between a bug and feature) Component: Cluster management and removed NeedsWebsiteDocsUpdate What it says labels May 16, 2023
@timvaillancourt
Merge branch 'main' into tx-throttler-topoWatcher-FilterByShard
705a1ac 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt
go fmt
927b721 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt
Check err
5b30919 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt timvaillancourt mentioned this pull request May 25, 2023
Merged
4 tasks
@frouioui frouioui modified the milestones: v17.0.0, v18.0.0 Jun 12, 2023
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jul 13, 2023

This PR is being marked as stale because it has been open for 30 days with no activity. To rectify, you may do any of the following:

  • Push additional commits to the associated branch.
  • Remove the stale label.
  • Add a comment indicating why it is not stale.

If no action is taken within 7 days, this PR will be closed.

@github-actions github-actions bot added the Stale Marks PRs as stale after a period of inactivity, which are then closed after a grace period. label Jul 13, 2023
@timvaillancourt
Copy link
Copy Markdown
Contributor Author

timvaillancourt commented Jul 17, 2023

Bump to keep this open

@github-actions github-actions bot removed the Stale Marks PRs as stale after a period of inactivity, which are then closed after a grace period. label Jul 18, 2023
@timvaillancourt
Merge branch 'main' into tx-throttler-topoWatcher-FilterByShard
f3b80e0 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt
Go fmt after conflict resolution
fb76352 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
shlomi-noach
shlomi-noach reviewed Jul 26, 2023
View reviewed changes
go/vt/vttablet/tabletserver/txthrottler/tx_throttler.go
topologyWatcherFactory = func(topoServer *topo.Server, hc discovery.HealthCheck, cell, keyspace, shard string, refreshInterval time.Duration, topoReadConcurrency int) TopologyWatcherInterface {
return discovery.NewCellTabletsWatcher(context.Background(), topoServer, hc, discovery.NewFilterByKeyspace([]string{keyspace}), cell, refreshInterval, true, topoReadConcurrency)
topologyWatcherFactory = func(topoServer *topo.Server, hc discovery.HealthCheck, cell, keyspace, shard string, refreshInterval time.Duration, topoReadConcurrency int) (TopologyWatcherInterface, error) {
cellTabletsFilter, err := discovery.NewFilterByShard([]string{fmt.Sprintf("%s|%s", keyspace, shard)})
Copy link
Copy Markdown
Contributor

@shlomi-noach shlomi-noach Jul 26, 2023

Choose a reason for hiding this comment

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

The conventional way to combine keyspace&shard is with /. Is there a reason the above uses | to separate them? If there's no particular reason, please accept the below suggestion:

Suggested change
cellTabletsFilter, err := discovery.NewFilterByShard([]string{fmt.Sprintf("%s|%s", keyspace, shard)})
cellTabletsFilter, err := discovery.NewFilterByShard([]string{fmt.Sprintf("%s/%s", keyspace, shard)})

Copy link
Copy Markdown
Contributor Author

@timvaillancourt timvaillancourt Aug 3, 2023

Choose a reason for hiding this comment

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

@shlomi-noach for some reason discovery.NewFilterByShard uses | as a delimiter for filters. It's strange because later in that func the format you suggest is used in an error 😄

@timvaillancourt
Merge branch 'main' into tx-throttler-topoWatcher-FilterByShard
699b9c0 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt
Fix merge conflict resolution
bce443c 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Sep 3, 2023

This PR is being marked as stale because it has been open for 30 days with no activity. To rectify, you may do any of the following:

  • Push additional commits to the associated branch.
  • Remove the stale label.
  • Add a comment indicating why it is not stale.

If no action is taken within 7 days, this PR will be closed.

@github-actions github-actions bot added the Stale Marks PRs as stale after a period of inactivity, which are then closed after a grace period. label Sep 3, 2023
@timvaillancourt
Copy link
Copy Markdown
Contributor Author

timvaillancourt commented Sep 3, 2023

Bumping to keep this open. I hope to add the unit test requested soon!

@github-actions github-actions bot removed the Stale Marks PRs as stale after a period of inactivity, which are then closed after a grace period. label Sep 4, 2023
@frouioui frouioui modified the milestones: v18.0.0, v19.0.0 Sep 29, 2023
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Oct 31, 2023

This PR is being marked as stale because it has been open for 30 days with no activity. To rectify, you may do any of the following:

  • Push additional commits to the associated branch.
  • Remove the stale label.
  • Add a comment indicating why it is not stale.

If no action is taken within 7 days, this PR will be closed.

@github-actions github-actions bot added the Stale Marks PRs as stale after a period of inactivity, which are then closed after a grace period. label Oct 31, 2023
@timvaillancourt
Copy link
Copy Markdown
Contributor Author

timvaillancourt commented Nov 1, 2023

No longer required due to #14412 🎉. Closing

@timvaillancourt timvaillancourt deleted the tx-throttler-topoWatcher-FilterByShard branch November 1, 2023 20:00
@timvaillancourt timvaillancourt mentioned this pull request Jun 14, 2024
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shlomi-noach shlomi-noach shlomi-noach left review comments

@harshit-gangal harshit-gangal harshit-gangal left review comments

@systay systay Awaiting requested review from systay systay is a code owner

@rohit-nayak-ps rohit-nayak-ps Awaiting requested review from rohit-nayak-ps rohit-nayak-ps is a code owner

Assignees

No one assigned

Labels

Component: Cluster management Stale Marks PRs as stale after a period of inactivity, which are then closed after a grace period. Type: Enhancement Logical improvement (somewhere between a bug and feature)

Projects

None yet

Milestone

v19.0.0

Development

Successfully merging this pull request may close these issues.

Feature Request: filter topology by shard in vttablet txthrottler

4 participants

@timvaillancourt @shlomi-noach @harshit-gangal @frouioui