storage: retry AdminSplit on roachpb.ConflictUpdatingRangeDescError

This allows an internal error to be retried instead of it needing to
be retried on the outside.

pkg/cmd/zerosum/main.go

@@ -34,7 +34,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/cmd/internal/localcluster"
 	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
-	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/util/encoding"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
@@ -227,8 +226,7 @@ func (z *zeroSum) monkey(tableID uint32, d time.Duration) {
 		switch r.Intn(2) {
 		case 0:
 			if err := z.Split(z.RandNode(r.Intn), key); err != nil {
-				if strings.Contains(err.Error(), "range is already split at key") ||
-					strings.Contains(err.Error(), storage.ErrMsgConflictUpdatingRangeDesc) {
+				if strings.Contains(err.Error(), "range is already split at key") {
 					continue
 				}
 				z.maybeLogError(err)

pkg/kv/dist_sender.go

@@ -933,6 +933,9 @@ func (ds *DistSender) sendPartialBatch(
 			log.VEventf(ctx, 1, "likely split; resending batch to span: %s", tErr)
 			reply, pErr = ds.divideAndSendBatchToRanges(ctx, ba, intersected, isFirst)
 			return response{reply: reply, pErr: pErr}
+		case *roachpb.ConflictUpdatingRangeDescError:
+			log.Event(ctx, "retrying on conflict updating range descriptor error")
+			continue
 		}
 		break
 	}

pkg/roachpb/errors.go

@@ -354,6 +354,16 @@ func (e *AmbiguousResultError) message(_ *Error) string {
 
 var _ ErrorDetailInterface = &AmbiguousResultError{}
 
+func (e *ConflictUpdatingRangeDescError) Error() string {
+	return "conflict updating range descriptor"
+}
+
+func (e *ConflictUpdatingRangeDescError) message(_ *Error) string {
+	return e.Error()
+}
+
+var _ ErrorDetailInterface = &ConflictUpdatingRangeDescError{}
+
 func (e *TransactionAbortedError) Error() string {
 	return "txn aborted"
 }