use same txn for lock

0chain · Aug 4, 2023 · 8176b42 · 8176b42
1 parent 3138346
commit 8176b42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/code/go/0chain.net/blobbercore/allocation/dao.go b/code/go/0chain.net/blobbercore/allocation/dao.go
@@ -14,14 +14,14 @@ import (
 func GetOrCreate(ctx context.Context, allocationId string) (*Allocation, error) {
 
 	db := datastore.GetStore().CreateTransaction(ctx)
-	tx := datastore.GetStore().GetTransaction(ctx)
+	// tx := datastore.GetStore().GetTransaction(ctx)
 
 	if len(allocationId) == 0 {
 		return nil, errors.Throw(constants.ErrInvalidParameter, "tx")
 	}
 
 	alloc, err := Repo.GetById(db, allocationId)
-	tx.Rollback()
+	// tx.Rollback()
 
 	if err == nil {
 		return alloc, nil

diff --git a/code/go/0chain.net/blobbercore/handler/context.go b/code/go/0chain.net/blobbercore/handler/context.go
@@ -147,6 +147,7 @@ func WithHandler(handler func(ctx *Context) (interface{}, error)) func(w http.Re
 		w.Header().Set("Content-Type", "application/json")
 
 		ctx, err := WithVerify(r)
+		txn := datastore.GetStore().GetTransaction(ctx)
 		statusCode := ctx.StatusCode
 
 		if err != nil {
@@ -155,6 +156,7 @@ func WithHandler(handler func(ctx *Context) (interface{}, error)) func(w http.Re
 			}
 
 			http.Error(w, err.Error(), statusCode)
+			txn.Rollback()
 			return
 		}
 
@@ -165,7 +167,7 @@ func WithHandler(handler func(ctx *Context) (interface{}, error)) func(w http.Re
 			if statusCode == 0 {
 				statusCode = http.StatusInternalServerError
 			}
-
+			txn.Rollback()
 			http.Error(w, err.Error(), statusCode)
 			return
 		}
@@ -174,7 +176,7 @@ func WithHandler(handler func(ctx *Context) (interface{}, error)) func(w http.Re
 			statusCode = http.StatusOK
 		}
 		w.WriteHeader(statusCode)
-
+		txn.Commit()
 		if result != nil {
 			json.NewEncoder(w).Encode(result) //nolint
 		}