Merge pull request #1429 from 0chain/update/sprint-1.15-staging

Update/sprint 1.15 staging

Author: dabasov

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

@@ -166,7 +166,7 @@ func UpdateConnectionObjSize(connectionID string, addSize int64) {
 	connectionObj.UpdatedAt = time.Now()
 }
 
-func SaveFileChange(connectionID, pathHash, fileName string, cmd FileCommand, isFinal bool, contentSize int64, offset, dataWritten int64) (bool, error) {
+func SaveFileChange(connectionID, pathHash, fileName string, cmd FileCommand, isFinal bool, contentSize, offset, dataWritten, addSize int64) (bool, error) {
 	connectionObjMutex.RLock()
 	connectionObj := connectionProcessor[connectionID]
 	connectionObjMutex.RUnlock()
@@ -210,6 +210,9 @@ func SaveFileChange(connectionID, pathHash, fileName string, cmd FileCommand, is
 			Offset:    offset,
 			DataBytes: dataWritten,
 		}, contentSize)
+		if addSize != 0 {
+			UpdateConnectionObjSize(connectionID, addSize)
+		}
 	} else {
 		change.seqPQ.Push(seqpriorityqueue.UploadData{
 			Offset:    offset,

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

@@ -147,7 +147,6 @@ func (cmd *UpdateFileCommand) ProcessContent(allocationObj *allocation.Allocatio
 		if fileOutputData.ContentSize != cmd.fileChanger.Size {
 			return result, common.NewError("upload_error", fmt.Sprintf("File size mismatch. Expected: %d, Actual: %d", cmd.fileChanger.Size, fileOutputData.ContentSize))
 		}
-		allocation.UpdateConnectionObjSize(connID, cmd.fileChanger.Size-cmd.existingFileRef.Size)
 	}
 
 	if cmd.thumbFile != nil {
@@ -157,7 +156,7 @@ func (cmd *UpdateFileCommand) ProcessContent(allocationObj *allocation.Allocatio
 		}
 	}
 
-	saveChange, err := allocation.SaveFileChange(connID, cmd.fileChanger.PathHash, cmd.fileChanger.Filename, cmd, cmd.fileChanger.IsFinal, cmd.fileChanger.Size, cmd.fileChanger.UploadOffset, fileOutputData.Size)
+	saveChange, err := allocation.SaveFileChange(connID, cmd.fileChanger.PathHash, cmd.fileChanger.Filename, cmd, cmd.fileChanger.IsFinal, cmd.fileChanger.Size, cmd.fileChanger.UploadOffset, fileOutputData.Size, cmd.fileChanger.Size-cmd.existingFileRef.Size)
 	if err != nil {
 		return result, err
 	}

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

@@ -164,7 +164,6 @@ func (cmd *UploadFileCommand) ProcessContent(allocationObj *allocation.Allocatio
 		if fileOutputData.ContentSize != cmd.fileChanger.Size {
 			return result, common.NewError("upload_error", fmt.Sprintf("File size mismatch. Expected: %d, Actual: %d", cmd.fileChanger.Size, fileOutputData.ContentSize))
 		}
-		allocation.UpdateConnectionObjSize(connectionID, cmd.fileChanger.Size)
 	}
 
 	if cmd.thumbFile != nil {
@@ -175,7 +174,7 @@ func (cmd *UploadFileCommand) ProcessContent(allocationObj *allocation.Allocatio
 		}
 	}
 
-	saveChange, err := allocation.SaveFileChange(connectionID, cmd.fileChanger.PathHash, cmd.fileChanger.Filename, cmd, cmd.fileChanger.IsFinal, cmd.fileChanger.Size, cmd.fileChanger.UploadOffset, fileOutputData.Size)
+	saveChange, err := allocation.SaveFileChange(connectionID, cmd.fileChanger.PathHash, cmd.fileChanger.Filename, cmd, cmd.fileChanger.IsFinal, cmd.fileChanger.Size, cmd.fileChanger.UploadOffset, fileOutputData.Size, cmd.fileChanger.Size)
 	if err != nil {
 		logging.Logger.Error("UploadFileCommand.ProcessContent", zap.Error(err))
 		return result, err

code/go/0chain.net/blobbercore/reference/object.go

@@ -35,7 +35,6 @@ func DeleteObject(ctx context.Context, rootRef *Ref, allocationID, objPath strin
 		return nil
 	}
 	parentPath, deleteFileName := filepath.Split(objPath)
-
 	rootRef.UpdatedAt = ts
 	fields, err := common.GetPathFields(parentPath)
 	if err != nil {
@@ -63,7 +62,8 @@ func DeleteObject(ctx context.Context, rootRef *Ref, allocationID, objPath strin
 	}
 
 	for i, child := range dirRef.Children {
-		if child.Name == deleteFileName {
+		basePath := filepath.Base(child.Path)
+		if basePath == deleteFileName || child.Path == objPath {
 			dirRef.RemoveChild(i)
 			break
 		}

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

@@ -256,7 +256,7 @@ func tryAgain(md *markerData) {
 
 // Can add more cases where we don't want to retry
 func retryRedeem(errString string) bool {
-	return !strings.Contains(errString, "value not present") || !strings.Contains(errString, "Blobber is not part of the allocation")
+	return !strings.Contains(errString, "value not present") && !strings.Contains(errString, "Blobber is not part of the allocation")
 }
 
 func startCollector(ctx context.Context) {

goose/migrations/1716455063_ref_name_length.sql

@@ -0,0 +1,5 @@
+-- +goose Up
+-- +goose StatementBegin
+ALTER TABLE reference_objects ALTER COLUMN name TYPE character varying(150),
+ALTER COLUMN name SET NOT NULL;
+-- +goose StatementEnd