Skip to content

Commit

Permalink
Merge #102373
Browse files Browse the repository at this point in the history
102373: server: log instead of returning error r=maryliag a=maryliag

This fix was made on the backport PRs from #102026, but was missing on the original PR to master.

Part Of: #101948

Logs the error message, instead of returning an error, so the endpoint can still work if there is an issue on the activity tables.

Release note: None

Co-authored-by: maryliag <[email protected]>
  • Loading branch information
craig[bot] and maryliag committed Apr 27, 2023
2 parents e875499 + ad2254b commit ba4b220
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/server/combined_statement_stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ func getStatementDetails(
if settings.Version.IsActive(ctx, clusterversion.V23_1AddSystemActivityTables) {
activityHasData, err = activityTablesHaveFullData(ctx, ie, testingKnobs, reqStartTime)
if err != nil {
return nil, serverError(ctx, err)
log.Errorf(ctx, "Error on getStatementDetails: %s", err)
}
}

Expand Down

0 comments on commit ba4b220

Please sign in to comment.