readonly in commit write

Author: Hitenjain14

code/go/0chain.net/blobbercore/allocation/protocol.go

@@ -113,7 +113,7 @@ func FetchAllocationFromEventsDB(ctx context.Context, allocationID string, alloc
 	a.StartTime = sa.StartTime
 	a.StorageVersion = uint8(sa.StorageVersion)
 	a.OwnerSigningPublicKey = sa.OwnerSigningPublicKey
-	logging.Logger.Info("OwnerSigningPublicKey", zap.String("OwnerSigningPublicKey", a.OwnerSigningPublicKey), zap.String("allocation_id", a.ID))
+	logging.Logger.Info("OwnerSigningPublicKey", zap.String("OwnerSigningPublicKey", a.OwnerSigningPublicKey), zap.String("allocation_id", a.ID), zap.String("allocation_tx", a.Tx))
 
 	m := map[string]interface{}{
 		"allocation_id":  a.ID,
@@ -141,7 +141,7 @@ func FetchAllocationFromEventsDB(ctx context.Context, allocationID string, alloc
 		return a, nil
 	}
 
-	logging.Logger.Info("Saving the allocation to DB", zap.String("allocation_id", a.ID))
+	logging.Logger.Info("Saving the allocation to DB", zap.String("allocation_id", a.ID), zap.String("allocation_tx", a.Tx))
 
 	if !isExist {
 		err = Repo.Save(ctx, a)

code/go/0chain.net/blobbercore/handler/handler_common.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/0chain/gosdk/core/client"
 	"net/http"
 	"time"
 
+	"github.com/0chain/gosdk/core/client"
+
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/allocation"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/blobberhttp"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/writemarker"
@@ -142,12 +143,12 @@ func WithStatusConnectionForWM(handler common.StatusCodeResponderF) common.Statu
 
 		mutex := lock.GetMutex(allocation.Allocation{}.TableName(), allocationID)
 		Logger.Info("Locking allocation", zap.String("allocation_id", allocationID))
+		mutex.Lock()
+		defer mutex.Unlock()
 		wmSet := writemarker.SetCommittingMarker(allocationID, true)
 		if !wmSet {
 			return nil, http.StatusBadRequest, common.NewError("pending_markers", "Committing marker set failed")
 		}
-		mutex.Lock()
-		defer mutex.Unlock()
 		ctx = GetMetaDataStore().CreateTransaction(ctx)
 		tx := GetMetaDataStore().GetTransaction(ctx)
 		resp, statusCode, err = handler(ctx, r)
@@ -161,6 +162,7 @@ func WithStatusConnectionForWM(handler common.StatusCodeResponderF) common.Statu
 				}
 				writemarker.SetCommittingMarker(allocationID, false)
 			}
+			Logger.Debug("Unlocking allocation", zap.String("allocation_id", allocationID))
 		}()
 
 		if err != nil {

code/go/0chain.net/blobbercore/handler/object_operation_handler.go

@@ -622,7 +622,7 @@ func (fsh *StorageHandler) CommitWrite(ctx context.Context, r *http.Request) (*b
 		return nil, common.NewError("blacklisted_client", "Client is blacklisted: "+clientID)
 	}
 
-	allocationObj, err := fsh.verifyAllocation(ctx, allocationId, allocationTx, false)
+	allocationObj, err := fsh.verifyAllocation(ctx, allocationId, allocationTx, true)
 	if err != nil {
 		return nil, common.NewError("invalid_parameters", "Invalid allocation id passed."+err.Error())
 	}

code/go/0chain.net/blobbercore/writemarker/worker.go

@@ -115,15 +115,16 @@ func SetupWorkers(ctx context.Context) {
 }
 
 func redeemWriteMarker(md *markerData) error {
-	ctx := datastore.GetStore().CreateTransaction(context.TODO())
+	timeoutCtx, cancel := context.WithTimeout(context.Background(), 180*time.Second)
+	defer cancel()
+	ctx := datastore.GetStore().CreateTransaction(timeoutCtx)
 	db := datastore.GetStore().GetTransaction(ctx)
 	allocationID := md.allocationID
 	shouldRollback := false
 	start := time.Now()
 	logging.Logger.Info("redeeming_write_marker", zap.String("allocationID", allocationID))
 	allocMu := lock.GetMutex(allocation.Allocation{}.TableName(), allocationID)
 	allocMu.RLock()
-	defer allocMu.RUnlock()
 	defer func() {
 		if shouldRollback {
 			if rollbackErr := db.Rollback().Error; rollbackErr != nil {
@@ -135,8 +136,9 @@ func redeemWriteMarker(md *markerData) error {
 		} else {
 			deleteMarkerData(allocationID)
 		}
+		allocMu.RUnlock()
 	}()
-
+	logging.Logger.Debug("getAllocation", zap.Any("allocation", allocationID))
 	alloc, err := allocation.Repo.GetAllocationFromDB(ctx, allocationID)
 	if err != nil {
 		logging.Logger.Error("Error redeeming the write marker.", zap.Any("allocation", allocationID), zap.Any("wm", allocationID), zap.Any("error", err))
@@ -153,7 +155,7 @@ func redeemWriteMarker(md *markerData) error {
 		shouldRollback = true
 		return nil
 	}
-
+	logging.Logger.Debug("getWritemarker", zap.Any("allocation", allocationID))
 	wm, err := GetWriteMarkerEntity(ctx, alloc.ID, alloc.AllocationRoot)
 	if err != nil {
 		logging.Logger.Error("Error redeeming the write marker.", zap.Any("allocation", allocationID), zap.Any("wm", alloc.AllocationRoot), zap.Any("error", err))
@@ -163,7 +165,7 @@ func redeemWriteMarker(md *markerData) error {
 		shouldRollback = true
 		return err
 	}
-
+	logging.Logger.Debug("RedeemMarker", zap.Any("allocation", allocationID), zap.Any("wm", wm.WM.AllocationRoot), zap.Any("txn", wm.CloseTxnID))
 	err = wm.RedeemMarker(ctx, alloc.LastRedeemedSeq+1)
 	if err != nil {
 		elapsedTime := time.Since(start)
@@ -178,7 +180,7 @@ func redeemWriteMarker(md *markerData) error {
 		shouldRollback = true
 		return err
 	}
-
+	logging.Logger.Debug("UpdateAllocationRedeem", zap.Any("allocation", allocationID), zap.Any("wm", wm.WM.AllocationRoot), zap.Any("txn", wm.CloseTxnID))
 	err = allocation.Repo.UpdateAllocationRedeem(ctx, allocationID, wm.WM.AllocationRoot, alloc, wm.Sequence)
 	if err != nil {
 		logging.Logger.Error("Error redeeming the write marker. Allocation latest wm redeemed update failed",
@@ -188,7 +190,7 @@ func redeemWriteMarker(md *markerData) error {
 		go tryAgain(md)
 		return err
 	}
-
+	logging.Logger.Debug("RedeemMarker", zap.Any("allocation", allocationID), zap.Any("wm", wm.WM.AllocationRoot), zap.Any("txn", wm.CloseTxnID))
 	err = db.Commit().Error
 	if err != nil {
 		logging.Logger.Error("Error committing the writemarker redeem",