Avoid SAVEPOINT with backoff

Author: Matt Whelan

crdb/common.go

@@ -87,14 +87,29 @@ func ExecuteInTx(ctx context.Context, tx Tx, fn func() error) (err error) {
 			return err
 		}
 
-		if rollbackErr := tx.Exec(ctx, "ROLLBACK TO SAVEPOINT cockroach_restart"); rollbackErr != nil {
-			return newTxnRestartError(rollbackErr, err)
+		// We have a retryable error. Check the retry policy.
+		delay, retryErr := retryFunc(err)
+		if delay > 0 && retryErr == nil {
+			// We don't want to hold locks while waiting for a backoff, so restart the entire transaction
+			if restartErr := tx.Exec(ctx, "ROLLBACK"); restartErr != nil {
+				return newTxnRestartError(restartErr, err)
+			}
+			if restartErr := tx.Exec(ctx, "BEGIN"); restartErr != nil {
+				return newTxnRestartError(restartErr, err)
+			}
+			if restartErr := tx.Exec(ctx, "SAVEPOINT cockroach_restart"); restartErr != nil {
+				return newTxnRestartError(restartErr, err)
+			}
+		} else {
+			if rollbackErr := tx.Exec(ctx, "ROLLBACK TO SAVEPOINT cockroach_restart"); rollbackErr != nil {
+				return newTxnRestartError(rollbackErr, err)
+			}
 		}
 
-		delay, retryErr := retryFunc(err)
 		if retryErr != nil {
 			return retryErr
 		}
+
 		if delay > 0 {
 			select {
 			case <-time.After(delay):

crdb/tx.go

@@ -278,7 +278,7 @@ func (tx stdlibTxnAdapter) Commit(context.Context) error {
 	return tx.tx.Commit()
 }
 
-// Commit is part of the tx interface.
+// Rollback is part of the tx interface.
 func (tx stdlibTxnAdapter) Rollback(context.Context) error {
 	return tx.tx.Rollback()
 }