Merge branch 'staging' into sprint-1.12

Author: dabasov

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

@@ -86,6 +86,12 @@ func (nf *UploadFileChanger) applyChange(ctx context.Context, rootRef *reference
 		}
 	}
 
+	for _, child := range dirRef.Children {
+		if child.Name == nf.Filename {
+			return nil, common.NewError("duplicate_file", "File already exists")
+		}
+	}
+
 	newFile := &reference.Ref{
 		ActualFileHash:          nf.ActualHash,
 		ActualFileHashSignature: nf.ActualFileHashSignature,

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

@@ -98,6 +98,8 @@ func redeemWriteMarker(wm *WriteMarkerEntity) error {
 		if wm.ReedeemRetries == 0 && !alloc.IsRedeemRequired {
 			wm.ReedeemRetries++
 			go tryAgain(wm)
+			shouldRollback = true
+			return nil
 		}
 		_ = wm.UpdateStatus(ctx, Rollbacked, "rollbacked", "")
 		err = db.Commit().Error
@@ -116,6 +118,11 @@ func redeemWriteMarker(wm *WriteMarkerEntity) error {
 			zap.Any("wm", wm), zap.Any("error", err), zap.Any("elapsedTime", elapsedTime))
 		if retryRedeem(err.Error()) {
 			go tryAgain(wm)
+		} else {
+			mut := GetLock(allocationID)
+			if mut != nil {
+				mut.Release(1)
+			}
 		}
 		shouldRollback = true