From d7d2b2a665fdce6c4b5255678e4e1a356a9a4ce6 Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Wed, 8 Feb 2023 17:45:07 -0800 Subject: [PATCH] Missed error check --- go/libraries/doltcore/sqle/read_replica_database.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go/libraries/doltcore/sqle/read_replica_database.go b/go/libraries/doltcore/sqle/read_replica_database.go index 461a95a913..4920bc65f7 100644 --- a/go/libraries/doltcore/sqle/read_replica_database.go +++ b/go/libraries/doltcore/sqle/read_replica_database.go @@ -406,7 +406,9 @@ OPTIMISTIC_RETRY: switch remoteRef.Ref.GetType() { case ref.BranchRefType: err := rrd.createNewBranchFromRemote(ctx, remoteRef, trackingRef) - if err != nil { + if errors.Is(err, datas.ErrOptimisticLockFailed) { + continue OPTIMISTIC_RETRY + } else if err != nil { return nil, err }