From 0f2cc719cdc6e57cbcf4e6de3ff42e67a74b03de Mon Sep 17 00:00:00 2001
From: Tobias Grieger <tobias.b.grieger@gmail.com>
Date: Wed, 17 Feb 2021 12:45:47 +0100
Subject: [PATCH] sql: work around contention registry errors

See https://github.com/cockroachdb/cockroach/issues/60669.

Release note: None
---
 pkg/sql/distsql_running.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/sql/distsql_running.go b/pkg/sql/distsql_running.go
index 119119cb7ba0..854ca435563b 100644
--- a/pkg/sql/distsql_running.go
+++ b/pkg/sql/distsql_running.go
@@ -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
 					}
 				})
 			}