vtexplain: Ensure memory topo is set up for throttler #15279
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dbussink
requested review from
harshit-gangal,
systay,
shlomi-noach,
rohit-nayak-ps,
deepthi,
mattlord and
ajm188
as code owners
Review ChecklistHello reviewers! 👋 Please follow this checklist when reviewing this Pull Request. General
Tests
Documentation
New flags
If a workflow is added or modified:
Backward compatibility
|
vitess-bot
bot
added
NeedsBackportReason
dbussink
commented
Feb 18, 2024
| _, err = conn.Update(ctx, srvPath, data, nil) | ||
| if err != nil { | ||
| return err | ||
| } |
There was a problem hiding this comment.
@shlomi-noach In order to not have the throttler log errors inside vtexplain, I had to set up the above minimum stuff in the memory topo for SrvKeyspace.
I wonder if there's a better way for this and if this could be refactored in a better way? Should we have some option to disable more parts of the throttler when we're inside vtexplain?
I guess alternatively, we could make the throttler a parameter in NewTabletServer instead to inject it (which is called inside vtexplain), so we could inject a no-op throttler? Any other ideas?
There was a problem hiding this comment.
@dbussink could you please clarify what errors did the throttler log inside vtexplain?
dbussink
force-pushed
the
fix-vtexplain-throttler-setup
branch
from
047c167
to
e35d1a7
Compare
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #15279 +/- ##
==========================================
+ Coverage 67.41% 67.48% +0.06%
==========================================
Files 1560 1561 +1
Lines 192752 193330 +578
==========================================
+ Hits 129952 130469 +517
- Misses 62800 62861 +61 ☔ View full report in Codecov by Sentry. |
dbussink
force-pushed
the
fix-vtexplain-throttler-setup
branch
from
e35d1a7
to
116a27e
Compare
dbussink
added
Type: Bug
Component: TabletManager
Component: vtexplain
| @@ -358,7 +358,9 @@ func (throttler *Throttler) normalizeThrottlerConfig(throttlerConfig *topodatapb | |||
|
|
|||
| func (throttler *Throttler) WatchSrvKeyspaceCallback(srvks *topodatapb.SrvKeyspace, err error) bool { | |||
| if err != nil { | |||
| log.Errorf("WatchSrvKeyspaceCallback error: %v", err) | |||
| if !topo.IsErrType(err, topo.Interrupted) && !errors.Is(err, context.Canceled) { | |||
| _, err = conn.Update(ctx, srvPath, data, nil) | ||
| if err != nil { | ||
| return err | ||
| } |
There was a problem hiding this comment.
@dbussink could you please clarify what errors did the throttler log inside vtexplain?
shlomi-noach
approved these changes
Feb 19, 2024
There was a problem hiding this comment.
For now, this is a good workaround. We need to review how we run tabletserver within the context of vtexplain. We are not interested in the throttler at all running in such context, and possibly other components (heartbeat writer, etc.). We'll take that into a separate discussion/change.
dbussink
added
Backport to: release-17.0
Backport to: release-18.0
dbussink
added
the
Backport to: release-19.0
|
To be backported to all supported versions as the throttler will produce the same kind of logging on all versions since |
dbussink
force-pushed
the
fix-vtexplain-throttler-setup
branch
from
116a27e
to
bd20ce3
Compare
dbussink
commented
Feb 19, 2024
| @@ -40,7 +40,7 @@ func (k *srvKeyspaceKey) String() string { | |||
| func NewSrvKeyspaceWatcher(ctx context.Context, topoServer *topo.Server, counts *stats.CountersWithSingleLabel, cacheRefresh, cacheTTL time.Duration) *SrvKeyspaceWatcher { | |||
| watch := func(entry *watchEntry) { | |||
| key := entry.key.(*srvKeyspaceKey) | |||
| requestCtx, requestCancel := context.WithCancel(context.Background()) | |||
| requestCtx, requestCancel := context.WithCancel(ctx) | |||
There was a problem hiding this comment.
This was incorrectly using context.Background(). I also audited the paths into this function and from things like the CLI invocation, we do pass in the background context correctly.
See also watch_srvvschema where we do have the logic correct.
|
No more stray logging after this change (together with #15275). BeforeAfterNo more noise and also a lot faster test runtime. |
rohit-nayak-ps
approved these changes
Feb 19, 2024
This logic ensures the memorytopo is set up for the throttler logic so that it doesn't log any errors. Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
dbussink
force-pushed
the
fix-vtexplain-throttler-setup
branch
from
bd20ce3
to
42e2746
Compare
vitess-bot
pushed a commit
that referenced
this pull request
Feb 19, 2024
Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
notfelineit
pushed a commit
to planetscale/vitess
that referenced
this pull request
Mar 12, 2024
…itessio#15279) (vitessio#15284) (vitessio#4466) Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com> Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
frouioui
pushed a commit
to planetscale/vitess
that referenced
this pull request
Mar 26, 2024
…itessio#15279) (vitessio#15284) (vitessio#4467) Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com> Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This logic ensures the memorytopo is set up for the throttler logic so that it doesn't log any errors.
Needs to be backported to all supported versions, since the throttler is part of all of those.
Related Issue(s)
Part of #15242
Checklist