Skip to content

Commit

Permalink
sql: work around contention registry errors
Browse files Browse the repository at this point in the history
See cockroachdb#60669.

Release note: None
  • Loading branch information
tbg committed Feb 17, 2021
1 parent be115b9 commit 0f2cc71
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkg/sql/distsql_running.go
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,9 @@ func (r *DistSQLReceiver) Push(
r.contendedQueryMetric = nil
}
if err := r.contentionRegistry.AddContentionEvent(ev); err != nil {
r.resultWriter.SetError(errors.Wrap(err, "unable to add contention event to registry"))
// TODO(asubiotto): see https://github.com/cockroachdb/cockroach/issues/60669
// r.resultWriter.SetError(errors.Wrap(err, "unable to add contention event to registry"))
_ = err
}
})
}
Expand Down

0 comments on commit 0f2cc71

Please sign in to comment.