cli: return server's errors in nodelocal upload #46311
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
|
This change is |
Previously the cli code for 'nodelocal upload' was using the retrying helper from cockroach-go to run its COPY-based put of the file. Somehow this meant that the error the server was sending back to the client was getting lost and instead the 'current txn is aborted' error was all that was printed to the user. While I am still unclear on exactly where the original error went, it seems that by using the go db/sql interface directly we see the expected errors, and as this code is not running traditional OLTP/transactional SQL, it likely can skip the retry loop. Release justification: bug fix. Release note (cli change): ensure the correct error messages are shown to the user when using 'nodelocal upload'.
|
bors r+ |
Build succeeded |
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.
Previously the cli code for 'nodelocal upload' was using the retrying helper from cockroach-go
to run its COPY-based put of the file. Somehow this meant that the error the server was sending
back to the client was getting lost and instead the 'current txn is aborted' error was all that
was printed to the user. While I am still unclear on exactly where the original error went, it
seems that by using the go db/sql interface directly we see the expected errors, and as this
code is not running traditional OLTP/transactional SQL, it likely can skip the retry loop.
Fixes #46027.
Release justification: bug fix.
Release note (cli change): ensure the correct error messages are shown to the user when using 'nodelocal upload'.