use badger ErrConflict variable

sourcenetwork · Jan 27, 2023 · 18fc86f · 18fc86f
1 parent 5b0b3e5
commit 18fc86f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/datastore/badger/v3/datastore.go b/datastore/badger/v3/datastore.go
@@ -24,7 +24,10 @@ import (
 
 var log = logger.Logger("badger")
 
-var ErrClosed = errors.New("datastore closed")
+var (
+	ErrClosed      = errors.New("datastore closed")
+	ErrTxnConflict = badger.ErrConflict
+)
 
 type Datastore struct {
 	DB *badger.DB

diff --git a/net/server.go b/net/server.go
@@ -28,6 +28,7 @@ import (
 
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/core"
+	"github.com/sourcenetwork/defradb/datastore/badger/v3"
 	"github.com/sourcenetwork/defradb/errors"
 	"github.com/sourcenetwork/defradb/logging"
 	pb "github.com/sourcenetwork/defradb/net/pb"
@@ -208,7 +209,7 @@ func (s *server) PushLog(ctx context.Context, req *pb.PushLogRequest) (*pb.PushL
 		}
 
 		if txnErr = txn.Commit(ctx); txnErr != nil {
-			if txnErr.Error() == "Transaction Conflict. Please retry" {
+			if errors.Is(txnErr, badger.ErrTxnConflict) {
 				continue
 			}
 			return &pb.PushLogReply{}, txnErr

diff --git a/tests/integration/net/state/utils.go b/tests/integration/net/state/utils.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/config"
+	"github.com/sourcenetwork/defradb/datastore/badger/v3"
 	coreDB "github.com/sourcenetwork/defradb/db"
 	"github.com/sourcenetwork/defradb/errors"
 	"github.com/sourcenetwork/defradb/logging"
@@ -179,7 +180,7 @@ func updateDocument(
 	// retry limit is breached - important incase this is a different error)
 	for i := 0; i < db.MaxTxnRetries(); i++ {
 		err = col.Save(ctx, doc)
-		if err != nil && err.Error() == "Transaction Conflict. Please retry" {
+		if err != nil && errors.Is(err, badger.ErrTxnConflict) {
 			time.Sleep(100 * time.Millisecond)
 			continue
 		}