-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
go/vt/vtctl: fix nilness issues and error scopes #14711
Merged
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
Signed-off-by: Matt Layher <[email protected]>
mdlayher
requested review from
ajm188,
notfelineit,
deepthi and
rohit-nayak-ps
as code owners
December 6, 2023 21:19
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
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
Dec 6, 2023
ajm188
approved these changes
Dec 6, 2023
mattlord
approved these changes
Dec 6, 2023
frouioui
added
Type: Internal Cleanup
Component: General
Changes throughout the code base
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
labels
Dec 7, 2023
frouioui
reviewed
Dec 7, 2023
Comment on lines
-4996
to
4998
|
||
if dataErr == nil { | ||
if data, _, err := conn.Get(ctx, relativePath); err == nil { | ||
result, err := topo.DecodeContent(relativePath, data, false) | ||
if err != nil { | ||
err := vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "error decoding file content for cell %s: %v", cellPath, err) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oof, this is a good catch, the previous line 5000
was actually wrong
frouioui
approved these changes
Dec 7, 2023
ejortegau
pushed a commit
to slackhq/vitess
that referenced
this pull request
Dec 13, 2023
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.
Description
Fixes:
In particular the vtctld server had some confusing error scopes so I tried to infer the correct errors to display based on the surrounding context. It would appear the error message under
conn.ListDir
should show that error, so the existing err variable in scope there would have been completely unrelated to the error being checked.Related Issue(s)
Updates #14684.
Checklist
Deployment Notes
n/a