Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: interuss/dss
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 55a3ca5c49b3f5e15d52f346f893290391147898
Choose a base ref
..
head repository: interuss/dss
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ad28b743fd3b4f71cf77c5f2e880b10b02a1382b
Choose a head ref
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkg/scd/store/cockroach/operational_intents.go
2 changes: 1 addition & 1 deletion pkg/scd/store/cockroach/operational_intents.go
Original file line number Diff line number Diff line change
@@ -195,7 +195,7 @@ func (s *repo) DeleteOperationalIntent(ctx context.Context, id dssmodels.ID) err
} else if resErr := res.Err(); resErr != nil {
// Note: typically, res.Next() will be false and res.Err() non-nil when the query fails
// because it collided with another query and the whole transaction needs to be retried.
// This situation is extremely likely
// This situation is extremely likely to occur when the DSS is under concurrent load.
return stacktrace.Propagate(resErr, "Error in query: %s", deleteOperationQuery)
}