SQL: Set relevant errors to downstream #1159
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
aangelisc
requested review from
bossinc,
adamyeats and
katebrenner
and removed request for
a team
zoltanbedi
approved these changes
Nov 29, 2024
data/sqlutil/sql.go
Outdated
| @@ -22,7 +23,7 @@ import ( | |||
| func FrameFromRows(rows *sql.Rows, rowLimit int64, converters ...Converter) (*data.Frame, error) { | |||
| types, err := rows.ColumnTypes() | |||
| if err != nil { | |||
| return nil, err | |||
| return nil, backend.DownstreamError(err) | |||
There was a problem hiding this comment.
I haven't seen this one erroring. I probably wouldn't change this to downstream. The same for rows.Columns as it retruns the same errors.
There was a problem hiding this comment.
Updated! thank you @zoltanbedi
| @@ -73,7 +74,7 @@ func FrameFromRows(rows *sql.Rows, rowLimit int64, converters ...Converter) (*da | |||
| } | |||
|
|
|||
| if err := rows.Err(); err != nil { | |||
| return frame, err | |||
| return frame, backend.DownstreamError(err) | |||
There was a problem hiding this comment.
I'm fine marking this as a downstream error.
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.
Making some changes based on some errors being incorrectly marked in the MSSQL data source (that I believe can also be incorrectly marked in Postgres and MySQL also).
The errors that I've modified here are ones that I believe can only error due to downstream issues rather than the plugin. Please let me know if you disagree as I think determining which the ultimate source of an error is quite challenging.
With some follow up PR's to grafana/grafana this would fix some issues we're seeing atm.
If we don't want to mark all of these as downstream then I believe we should at least mark the
rows.Err()error as downstream.