opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 06:42:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

SQL: Set errors as downstream based on underlying errorsource (#97192)

Browse Source 
Set errors as downstream based on underlying errorsource
This commit is contained in:
Andreas Christou
2024-12-20 17:42:58 +00:00
committed by GitHub
parent d1846da0d2
commit 54333473f7
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/tsdb/grafana-postgresql-datasource/sqleng/sql_engine.go
View File

@ -235,6 +235,9 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
emptyFrame.SetMeta(&data.FrameMeta{ emptyFrame.SetMeta(&data.FrameMeta{
ExecutedQueryString: query, ExecutedQueryString: query,
}) })
if backend.IsDownstreamError(err) {
source = backend.ErrorSourceDownstream
}
queryResult.dataResponse.Error = fmt.Errorf("%s: %w", frameErr, err) queryResult.dataResponse.Error = fmt.Errorf("%s: %w", frameErr, err)
queryResult.dataResponse.ErrorSource = source queryResult.dataResponse.ErrorSource = source
queryResult.dataResponse.Frames = data.Frames{&emptyFrame} queryResult.dataResponse.Frames = data.Frames{&emptyFrame}

3
pkg/tsdb/mssql/sqleng/sql_engine.go
View File

@ -231,6 +231,9 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
emptyFrame.SetMeta(&data.FrameMeta{ emptyFrame.SetMeta(&data.FrameMeta{
ExecutedQueryString: query, ExecutedQueryString: query,
}) })
if backend.IsDownstreamError(err) {
source = backend.ErrorSourceDownstream
}
queryResult.dataResponse.Error = fmt.Errorf("%s: %w", frameErr, err) queryResult.dataResponse.Error = fmt.Errorf("%s: %w", frameErr, err)
queryResult.dataResponse.ErrorSource = source queryResult.dataResponse.ErrorSource = source
queryResult.dataResponse.Frames = data.Frames{&emptyFrame} queryResult.dataResponse.Frames = data.Frames{&emptyFrame}

3
pkg/tsdb/mysql/sqleng/sql_engine.go
View File

@ -231,6 +231,9 @@ func (e *DataSourceHandler) executeQuery(query backend.DataQuery, wg *sync.WaitG
emptyFrame.SetMeta(&data.FrameMeta{ emptyFrame.SetMeta(&data.FrameMeta{
ExecutedQueryString: query, ExecutedQueryString: query,
}) })
if backend.IsDownstreamError(err) {
source = backend.ErrorSourceDownstream
}
queryResult.dataResponse.Error = fmt.Errorf("%s: %w", frameErr, err) queryResult.dataResponse.Error = fmt.Errorf("%s: %w", frameErr, err)
queryResult.dataResponse.ErrorSource = source queryResult.dataResponse.ErrorSource = source
queryResult.dataResponse.Frames = data.Frames{&emptyFrame} queryResult.dataResponse.Frames = data.Frames{&emptyFrame}