Merge pull request #1411 from 0chain/fix/check-set

Check set commit marker

Author: dabasov

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

@@ -128,9 +128,12 @@ func WithStatusConnectionForWM(handler common.StatusCodeResponderF) common.Statu
 
 		mutex := lock.GetMutex(allocation.Allocation{}.TableName(), allocationID)
 		Logger.Info("Locking allocation", zap.String("allocation_id", allocationID))
+		wmSet := writemarker.SetCommittingMarker(allocationID, true)
+		if !wmSet {
+			return nil, http.StatusBadRequest, common.NewError("pending_markers", "Committing marker set failed")
+		}
 		mutex.Lock()
 		defer mutex.Unlock()
-		writemarker.SetCommittingMarker(allocationID, true)
 		tx := GetMetaDataStore().GetTransaction(ctx)
 		resp, statusCode, err = handler(ctx, r)
 

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

@@ -33,12 +33,16 @@ type markerData struct {
 	inCommit             bool // if new write marker is being committed
 }
 
-func SetCommittingMarker(allocationID string, committing bool) {
+func SetCommittingMarker(allocationID string, committing bool) bool {
 	markerDataMut.Lock()
 	defer markerDataMut.Unlock()
 	if data, ok := markerDataMap[allocationID]; ok {
+		if data.processing {
+			return false
+		}
 		data.inCommit = committing
 	}
+	return true
 }
 
 func SaveMarkerData(allocationID string, timestamp common.Timestamp, chainLength int) {