Merge #38790

38790: roachpb: remove TransactionStatusError_REASON_TXN_NOT_FOUND r=tbg a=nvanbenschoten This was last used in v2.1. v19.2 nodes don't need to worry about it. Release note: None Co-authored-by: Nathan VanBenschoten <[email protected]>
cockroachdb · Jul 10, 2019 · bf2075c · bf2075c
2 parents c42f094 + 71186f0
commit bf2075c
Show file tree

Hide file tree

Showing 5 changed files with 228 additions and 249 deletions.
diff --git a/c-deps/libroach/protos/roachpb/errors.pb.cc b/c-deps/libroach/protos/roachpb/errors.pb.cc
diff --git a/c-deps/libroach/protos/roachpb/errors.pb.h b/c-deps/libroach/protos/roachpb/errors.pb.h
diff --git a/pkg/kv/txn_interceptor_heartbeater.go b/pkg/kv/txn_interceptor_heartbeater.go
@@ -331,17 +331,6 @@ func (h *txnHeartbeater) heartbeat(ctx context.Context) bool {
 	if pErr != nil {
 		log.VEventf(ctx, 2, "heartbeat failed: %s", pErr)
 
-		// If the heartbeat request arrived to find a missing transaction record
-		// then we ignore the error. This is possible if the heartbeat loop was
-		// started before a BeginTxn request succeeds because of ambiguity in the
-		// first write request's response.
-		//
-		// TODO(nvanbenschoten): Remove this in 2.3.
-		if tse, ok := pErr.GetDetail().(*roachpb.TransactionStatusError); ok &&
-			tse.Reason == roachpb.TransactionStatusError_REASON_TXN_NOT_FOUND {
-			return true
-		}
-
 		// We need to be prepared here to handle the case of a
 		// TransactionAbortedError with no transaction proto in it.
 		//