Merge branch 'sprint-1.16' into doc/update

dabasov · web-flow · commit e655d47733d4 · 2024-06-09T21:28:26.000+03:00
diff --git a/.github/workflows/gosdk.yml b/.github/workflows/gosdk.yml
@@ -18,10 +18,10 @@ jobs:
   create-pr:
     runs-on: [arc-runner]
     steps:
-      - name: Setup go 1.20
+      - name: Setup go 1.21
         uses: actions/setup-go@v2
         with:
-          go-version: '1.20'
+          go-version: '1.21'
 
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/code/go/0chain.net/blobbercore/allocation/allocationchange.go b/code/go/0chain.net/blobbercore/allocation/allocationchange.go
@@ -135,7 +135,7 @@ func GetAllocationChanges(ctx context.Context, connectionID, allocationID, clien
 		allocationID,
 		clientID,
 		DeletedConnection,
-	).Preload("Changes").First(cc).Error
+	).Preload("Changes").Take(cc).Error
 
 	if err == nil {
 		cc.ComputeProperties()
diff --git a/code/go/0chain.net/blobbercore/allocation/connection.go b/code/go/0chain.net/blobbercore/allocation/connection.go
@@ -5,7 +5,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/datastore"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/filestore"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/reference"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/seqpriorityqueue"
@@ -166,7 +165,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(ctx context.Context, connectionID, pathHash, fileName string, cmd FileCommand, isFinal bool, contentSize, offset, dataWritten, addSize int64) (bool, error) {
 	connectionObjMutex.RLock()
 	connectionObj := connectionProcessor[connectionID]
 	connectionObjMutex.RUnlock()
@@ -175,31 +174,32 @@ func SaveFileChange(connectionID, pathHash, fileName string, cmd FileCommand, is
 	}
 	connectionObj.lock.Lock()
 	connectionObj.UpdatedAt = time.Now()
-	change := connectionObj.changes[pathHash]
 	saveChange := false
+	change := connectionObj.changes[pathHash]
 	if change == nil {
 		change = &ConnectionChange{}
 		connectionObj.changes[pathHash] = change
-		err := datastore.GetStore().WithNewTransaction(func(ctx context.Context) error {
-			dbConnectionObj, err := GetAllocationChanges(ctx, connectionID, connectionObj.AllocationID, connectionObj.ClientID)
-			if err != nil {
-				return err
-			}
-			return cmd.UpdateChange(ctx, dbConnectionObj)
-		})
+		change.lock.Lock()
+		defer change.lock.Unlock()
+		connectionObj.lock.Unlock()
+		dbConnectionObj, err := GetAllocationChanges(ctx, connectionID, connectionObj.AllocationID, connectionObj.ClientID)
 		if err != nil {
-			connectionObj.lock.Unlock()
-			return false, err
+			return saveChange, err
+		}
+		err = cmd.UpdateChange(ctx, dbConnectionObj)
+		if err != nil {
+			return saveChange, err
 		}
 		hasher := filestore.GetNewCommitHasher(contentSize)
 		change.hasher = hasher
 		change.seqPQ = seqpriorityqueue.NewSeqPriorityQueue(contentSize)
 		go hasher.Start(connectionObj.ctx, connectionID, connectionObj.AllocationID, fileName, pathHash, change.seqPQ)
 		saveChange = true
+	} else {
+		change.lock.Lock()
+		defer change.lock.Unlock()
+		connectionObj.lock.Unlock()
 	}
-	connectionObj.lock.Unlock()
-	change.lock.Lock()
-	defer change.lock.Unlock()
 	if change.isFinalized {
 		return false, nil
 	}
@@ -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,
diff --git a/code/go/0chain.net/blobbercore/allocation/file_changer_base.go b/code/go/0chain.net/blobbercore/allocation/file_changer_base.go
@@ -89,7 +89,7 @@ type FileCommand interface {
 	IsValidated(ctx context.Context, req *http.Request, allocationObj *Allocation, clientID string) error
 
 	// ProcessContent flush file to FileStorage
-	ProcessContent(allocationObj *Allocation) (UploadResult, error)
+	ProcessContent(ctx context.Context, allocationObj *Allocation) (UploadResult, error)
 
 	// ProcessThumbnail flush thumbnail file to FileStorage if it has.
 	ProcessThumbnail(allocationObj *Allocation) error
diff --git a/code/go/0chain.net/blobbercore/challenge/protocol.go b/code/go/0chain.net/blobbercore/challenge/protocol.go
@@ -286,6 +286,19 @@ func (cr *ChallengeEntity) LoadValidationTickets(ctx context.Context) error {
 				return
 			}
 
+			if validationTicket.ValidatorID != validatorID {
+				numFailed++
+				logging.Logger.Error(
+					"[challenge]resp: ",
+					zap.String("validator",
+						validatorID),
+					zap.Any("resp", string(resp)),
+					zap.Any("error", "Validator ID mismatch"),
+				)
+				updateMapAndSlice(validatorID, i, nil)
+				return
+			}
+
 			logging.Logger.Info(
 				"[challenge]resp: Got response from the validator.",
 				zap.Any("validator_response", validationTicket),
diff --git a/code/go/0chain.net/blobbercore/datastore/postgres.go b/code/go/0chain.net/blobbercore/datastore/postgres.go
@@ -67,8 +67,8 @@ func (store *postgresStore) Open() error {
 	}
 
 	sqldb.SetMaxIdleConns(100)
-	sqldb.SetMaxOpenConns(200)
-	sqldb.SetConnMaxLifetime(20 * time.Minute)
+	sqldb.SetMaxOpenConns(400)
+	sqldb.SetConnMaxLifetime(30 * time.Minute)
 	sqldb.SetConnMaxIdleTime(5 * time.Minute)
 	// Enable Logger, show detailed log
 	//db.LogMode(true)
@@ -85,12 +85,7 @@ func (store *postgresStore) Close() {
 }
 
 func (store *postgresStore) CreateTransaction(ctx context.Context) context.Context {
-	//conn := ctx.Value(ContextKeyTransaction)
-	//if conn != nil {
-	//	return ctx
-	//}
-
-	db := store.db.Begin()
+	db := store.db.WithContext(ctx).Begin()
 	return context.WithValue(ctx, ContextKeyTransaction, EnhanceDB(db))
 }
 
@@ -104,10 +99,13 @@ func (store *postgresStore) GetTransaction(ctx context.Context) *EnhancedDB {
 }
 
 func (store *postgresStore) WithNewTransaction(f func(ctx context.Context) error) error {
-	ctx := store.CreateTransaction(context.TODO())
-	defer ctx.Done()
-
+	timeoutctx, cancel := context.WithTimeout(context.TODO(), 45*time.Second)
+	defer cancel()
+	ctx := store.CreateTransaction(timeoutctx)
 	tx := store.GetTransaction(ctx)
+	if tx.Error != nil {
+		return tx.Error
+	}
 	err := f(ctx)
 	if err != nil {
 		tx.Rollback()
@@ -124,6 +122,9 @@ func (store *postgresStore) WithTransaction(ctx context.Context, f func(ctx cont
 	if tx == nil {
 		ctx = store.CreateTransaction(ctx)
 		tx = store.GetTransaction(ctx)
+		if tx.Error != nil {
+			return tx.Error
+		}
 	}
 
 	err := f(ctx)
diff --git a/code/go/0chain.net/blobbercore/filestore/storage.go b/code/go/0chain.net/blobbercore/filestore/storage.go
@@ -106,7 +106,7 @@ func (fs *FileStore) WriteFile(allocID, conID string, fileData *FileInputData, i
 		_ = os.Remove(tempFilePath)
 		return nil, common.NewError("file_size_mismatch", "File size is greater than expected")
 	}
-	logging.Logger.Info("temp_file_write: ", zap.String("filePath", fileData.Path), zap.Int64("currentSize", currentSize), zap.Int64("initialSize", initialSize), zap.Int64("writtenSize", writtenSize), zap.Int64("offset", fileData.UploadOffset), zap.Bool("ChunkUploaded", fileRef.ChunkUploaded))
+	logging.Logger.Info("temp_file_write: ", zap.String("filePath", fileData.Path), zap.Int64("currentSize", currentSize), zap.Int64("initialSize", initialSize), zap.Int64("writtenSize", writtenSize), zap.Int64("offset", fileData.UploadOffset), zap.String("tempFilePath", tempFilePath))
 	fileRef.Size = writtenSize
 	fileRef.Name = fileData.Name
 	fileRef.Path = fileData.Path
@@ -182,12 +182,6 @@ func (fs *FileStore) DeletePreCommitDir(allocID string) error {
 	if err != nil {
 		return common.NewError("pre_commit_dir_deletion_error", err.Error())
 	}
-	tempDir := fs.getAllocTempDir(allocID)
-	err = os.RemoveAll(tempDir)
-	if err != nil {
-		return common.NewError("temp_dir_deletion_error", err.Error())
-	}
-
 	return nil
 }
 
@@ -398,7 +392,7 @@ func (fs *FileStore) DeleteTempFile(allocID, conID string, fd *FileInputData) er
 		return common.NewError("invalid_allocation_id", "Allocation id cannot be empty")
 	}
 	fileObjectPath := fs.getTempPathForFile(allocID, fd.Name, encryption.Hash(fd.Path), conID)
-
+	logging.Logger.Info("deleting_temp_file", zap.String("fileObjectPath", fileObjectPath), zap.String("allocation_id", allocID), zap.String("connection_id", conID))
 	finfo, err := os.Stat(fileObjectPath)
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
diff --git a/code/go/0chain.net/blobbercore/filestore/tree_validation.go b/code/go/0chain.net/blobbercore/filestore/tree_validation.go
@@ -427,6 +427,7 @@ func (c *CommitHasher) Start(ctx context.Context, connID, allocID, fileName, fil
 	tempFilePath := GetFileStore().GetTempFilePath(allocID, connID, fileName, filePathHash)
 	f, err := os.Open(tempFilePath)
 	if err != nil {
+		logging.Logger.Error("hasher_open", zap.Error(err), zap.String("tempFilePath", tempFilePath))
 		c.hashErr = err
 		return
 	}
diff --git a/code/go/0chain.net/blobbercore/handler/file_command_delete.go b/code/go/0chain.net/blobbercore/handler/file_command_delete.go
@@ -68,7 +68,7 @@ func (cmd *DeleteFileCommand) UpdateChange(ctx context.Context, connectionObj *a
 }
 
 // ProcessContent flush file to FileStorage
-func (cmd *DeleteFileCommand) ProcessContent(allocationObj *allocation.Allocation) (allocation.UploadResult, error) {
+func (cmd *DeleteFileCommand) ProcessContent(_ context.Context, allocationObj *allocation.Allocation) (allocation.UploadResult, error) {
 	deleteSize := cmd.existingFileRef.Size
 	connectionID := cmd.connectionID
 	cmd.changeProcessor = &allocation.DeleteFileChange{ConnectionID: connectionID,
diff --git a/code/go/0chain.net/blobbercore/handler/file_command_update.go b/code/go/0chain.net/blobbercore/handler/file_command_update.go
@@ -106,7 +106,7 @@ func (cmd *UpdateFileCommand) IsValidated(ctx context.Context, req *http.Request
 }
 
 // ProcessContent flush file to FileStorage
-func (cmd *UpdateFileCommand) ProcessContent(allocationObj *allocation.Allocation) (allocation.UploadResult, error) {
+func (cmd *UpdateFileCommand) ProcessContent(ctx context.Context, allocationObj *allocation.Allocation) (allocation.UploadResult, error) {
 	result := allocation.UploadResult{}
 
 	result.Filename = cmd.fileChanger.Filename
@@ -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(ctx, 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
 	}
diff --git a/code/go/0chain.net/blobbercore/handler/file_command_upload.go b/code/go/0chain.net/blobbercore/handler/file_command_upload.go
@@ -122,7 +122,7 @@ func (cmd *UploadFileCommand) IsValidated(ctx context.Context, req *http.Request
 }
 
 // ProcessContent flush file to FileStorage
-func (cmd *UploadFileCommand) ProcessContent(allocationObj *allocation.Allocation) (allocation.UploadResult, error) {
+func (cmd *UploadFileCommand) ProcessContent(ctx context.Context, allocationObj *allocation.Allocation) (allocation.UploadResult, error) {
 	logging.Logger.Info("UploadFileCommand.ProcessContent", zap.Any("fileChanger", cmd.fileChanger.Path), zap.Any("uploadOffset", cmd.fileChanger.UploadOffset), zap.Any("isFinal", cmd.fileChanger.IsFinal))
 	result := allocation.UploadResult{}
 	defer cmd.contentFile.Close()
@@ -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(ctx, 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
diff --git a/code/go/0chain.net/blobbercore/handler/handler_test.go b/code/go/0chain.net/blobbercore/handler/handler_test.go
@@ -847,7 +847,6 @@ func TestHandlers_Requiring_Signature(t *testing.T) {
 						sqlmock.NewRows([]string{"found"}).
 							AddRow(false),
 					)
-				mock.ExpectBegin()
 				mock.ExpectQuery(regexp.QuoteMeta(`SELECT * FROM "allocation_connections" WHERE`)).
 					WithArgs(connectionID, alloc.ID, alloc.OwnerID, allocation.DeletedConnection).
 					WillReturnRows(
diff --git a/code/go/0chain.net/blobbercore/handler/object_operation_handler.go b/code/go/0chain.net/blobbercore/handler/object_operation_handler.go
@@ -706,7 +706,7 @@ func (fsh *StorageHandler) CommitWrite(ctx context.Context, r *http.Request) (*b
 		return nil, common.NewError("chain_length_exceeded", "Chain length exceeded")
 	}
 
-	err = writemarkerEntity.VerifyMarker(ctx, allocationObj, connectionObj)
+	err = writemarkerEntity.VerifyMarker(ctx, allocationObj, connectionObj, latestWriteMarkerEntity)
 	if err != nil {
 		result.AllocationRoot = allocationObj.AllocationRoot
 		result.ErrorMessage = "Verification of write marker failed: " + err.Error()
@@ -1373,7 +1373,7 @@ func (fsh *StorageHandler) WriteFile(ctx context.Context, r *http.Request) (*all
 		return nil, err
 	}
 	// call process content, which writes to file checks if conn obj needs to be updated and if commit hasher needs to be called
-	res, err := cmd.ProcessContent(allocationObj)
+	res, err := cmd.ProcessContent(ctx, allocationObj)
 	if err != nil {
 		return nil, err
 	}
@@ -1503,8 +1503,9 @@ func (fsh *StorageHandler) Rollback(ctx context.Context, r *http.Request) (*blob
 	}
 
 	elapsedWritePreRedeem := time.Since(startTime) - elapsedAllocation - elapsedGetLock - elapsedVerifyWM
-	c := datastore.GetStore().CreateTransaction(context.TODO())
-	defer c.Done()
+	timeoutCtx, cancel := context.WithTimeout(ctx, 45*time.Second)
+	defer cancel()
+	c := datastore.GetStore().CreateTransaction(timeoutCtx)
 	txn := datastore.GetStore().GetTransaction(c)
 	err = allocation.ApplyRollback(c, allocationID)
 	if err != nil {
diff --git a/code/go/0chain.net/blobbercore/reference/object.go b/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
 		}
diff --git a/code/go/0chain.net/blobbercore/reference/referencepath.go b/code/go/0chain.net/blobbercore/reference/referencepath.go
@@ -16,7 +16,7 @@ import (
 type ReferencePath struct {
 	Meta map[string]interface{} `json:"meta_data"`
 	List []*ReferencePath       `json:"list,omitempty"`
-	Ref  *Ref
+	Ref  *Ref                   `json:"-"`
 }
 
 func GetReferencePath(ctx context.Context, allocationID, path string) (*Ref, error) {
diff --git a/code/go/0chain.net/blobbercore/writemarker/entity.go b/code/go/0chain.net/blobbercore/writemarker/entity.go
@@ -142,7 +142,7 @@ func GetWriteMarkerEntity(ctx context.Context, allocation_root string) (*WriteMa
 	// err := db.First(wm, "allocation_root = ?", allocation_root).Error
 	err := db.Table((WriteMarkerEntity{}).TableName()).
 		Where("allocation_root=?", allocation_root).
-		Order("timestamp desc").
+		Order("sequence desc").
 		Take(wm).Error
 	if err != nil {
 		return nil, err
diff --git a/code/go/0chain.net/blobbercore/writemarker/protocol.go b/code/go/0chain.net/blobbercore/writemarker/protocol.go
@@ -25,8 +25,10 @@ type CommitConnection struct {
 	ChainData          []byte       `json:"chain_data"`
 }
 
+const timeGap = 180
+
 // VerifyMarker verify WriteMarker's hash and check allocation_root if it is unique
-func (wme *WriteMarkerEntity) VerifyMarker(ctx context.Context, dbAllocation *allocation.Allocation, co *allocation.AllocationChangeCollector) error {
+func (wme *WriteMarkerEntity) VerifyMarker(ctx context.Context, dbAllocation *allocation.Allocation, co *allocation.AllocationChangeCollector, latestWM *WriteMarkerEntity) error {
 	if wme == nil {
 		return common.NewError("invalid_write_marker", "No Write Marker was found")
 	}
@@ -92,9 +94,11 @@ func (wme *WriteMarkerEntity) VerifyMarker(ctx context.Context, dbAllocation *al
 	}
 
 	currTime := common.Now()
-	// blobber clock is allowed to be 60 seconds behind the current time
-	if wme.WM.Timestamp > currTime+60 {
-		return common.NewError("write_marker_validation_failed", "Write Marker timestamp is in the future")
+	// blobber clock is allowed to be 180 seconds behind the current time
+	if wme.WM.Timestamp > currTime+timeGap {
+		if latestWM == nil || wme.WM.Timestamp > latestWM.WM.Timestamp+timeGap {
+			return common.NewError("write_marker_validation_failed", "Write Marker timestamp is in the future")
+		}
 	}
 
 	hashData := wme.WM.GetHashData()
diff --git a/code/go/0chain.net/blobbercore/writemarker/worker.go b/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) {
diff --git a/docker.local/conductor-config/0chain_blobber.yaml b/docker.local/conductor-config/0chain_blobber.yaml
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/goose/migrations/1716455063_ref_name_length.sql b/goose/migrations/1716455063_ref_name_length.sql

Original file line number	Diff line number	Diff line change
`@@ -427,6 +427,7 @@ func (c *CommitHasher) Start(ctx context.Context, connID, allocID, fileName, fil`
`427`	`427`	`tempFilePath := GetFileStore().GetTempFilePath(allocID, connID, fileName, filePathHash)`
`428`	`428`	`f, err := os.Open(tempFilePath)`
`429`	`429`	`if err != nil {`
	`430`	`+ logging.Logger.Error("hasher_open", zap.Error(err), zap.String("tempFilePath", tempFilePath))`
`430`	`431`	`c.hashErr = err`
`431`	`432`	`return`
`432`	`433`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func (cmd DeleteFileCommand) UpdateChange(ctx context.Context, connectionObj a`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// ProcessContent flush file to FileStorage`
`71`		`-func (cmd DeleteFileCommand) ProcessContent(allocationObj allocation.Allocation) (allocation.UploadResult, error) {`
	`71`	`+func (cmd DeleteFileCommand) ProcessContent(_ context.Context, allocationObj allocation.Allocation) (allocation.UploadResult, error) {`
`72`	`72`	`deleteSize := cmd.existingFileRef.Size`
`73`	`73`	`connectionID := cmd.connectionID`
`74`	`74`	`cmd.changeProcessor = &allocation.DeleteFileChange{ConnectionID: connectionID,`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func (cmd UpdateFileCommand) IsValidated(ctx context.Context, req http.Request`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`// ProcessContent flush file to FileStorage`
`109`		`-func (cmd UpdateFileCommand) ProcessContent(allocationObj allocation.Allocation) (allocation.UploadResult, error) {`
	`109`	`+func (cmd UpdateFileCommand) ProcessContent(ctx context.Context, allocationObj allocation.Allocation) (allocation.UploadResult, error) {`
`110`	`110`	`result := allocation.UploadResult{}`
`111`	`111`
`112`	`112`	`result.Filename = cmd.fileChanger.Filename`
`@@ -147,7 +147,6 @@ func (cmd UpdateFileCommand) ProcessContent(allocationObj allocation.Allocatio`
`147`	`147`	`if fileOutputData.ContentSize != cmd.fileChanger.Size {`
`148`	`148`	`return result, common.NewError("upload_error", fmt.Sprintf("File size mismatch. Expected: %d, Actual: %d", cmd.fileChanger.Size, fileOutputData.ContentSize))`
`149`	`149`	`}`
`150`		`- allocation.UpdateConnectionObjSize(connID, cmd.fileChanger.Size-cmd.existingFileRef.Size)`
`151`	`150`	`}`
`152`	`151`
`153`	`152`	`if cmd.thumbFile != nil {`
`@@ -157,7 +156,7 @@ func (cmd UpdateFileCommand) ProcessContent(allocationObj allocation.Allocatio`
`157`	`156`	`}`
`158`	`157`	`}`
`159`	`158`
`160`		`- saveChange, err := allocation.SaveFileChange(connID, cmd.fileChanger.PathHash, cmd.fileChanger.Filename, cmd, cmd.fileChanger.IsFinal, cmd.fileChanger.Size, cmd.fileChanger.UploadOffset, fileOutputData.Size)`
	`159`	`+ saveChange, err := allocation.SaveFileChange(ctx, 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)`
`161`	`160`	`if err != nil {`
`162`	`161`	`return result, err`
`163`	`162`	`}`