Merge pull request #1491 from 0chain/hotfix/ctx-err

Return ctx err
0chain · May 25, 2024 · 99de129 · 99de129
2 parents e5a796e + d4e1ad5
commit 99de129
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/zboxcore/sdk/allocation.go b/zboxcore/sdk/allocation.go
@@ -2341,8 +2341,10 @@ func (a *Allocation) PauseUpload(remotePath string) error {
 	cancelFunc, ok := CancelOpCtx[remotePath]
 	cancelLock.Unlock()
 	if !ok {
+		logger.Logger.Error("PauseUpload: remote path not found", remotePath)
 		return errors.New("remote_path_not_found", "Invalid path. No upload in progress for the path "+remotePath)
 	} else {
+		logger.Logger.Info("PauseUpload: remote path found", remotePath)
 		cancelFunc(ErrPauseUpload)
 	}
 	return nil

diff --git a/zboxcore/sdk/chunked_upload.go b/zboxcore/sdk/chunked_upload.go
@@ -705,6 +705,7 @@ func (su *ChunkedUpload) processUpload(chunkStartIndex, chunkEndIndex int,
 		su.removeProgress()
 		return thrown.New("upload_failed", fmt.Sprintf("Upload failed. %s", err))
 	}
+	logger.Logger.Info("uploadingData: ", blobberUpload.chunkStartIndex, " - ", blobberUpload.chunkEndIndex, " ", isFinal, " ", su.fileMeta.RemotePath)
 	if !lastBufferOnly {
 		su.uploadWG.Add(1)
 		select {
@@ -716,7 +717,9 @@ func (su *ChunkedUpload) processUpload(chunkStartIndex, chunkEndIndex int,
 
 	if isFinal {
 		close(su.uploadChan)
+		logger.Logger.Info("Waiting for upload to complete")
 		su.uploadWG.Wait()
+		logger.Logger.Info("Upload completed")
 		select {
 		case <-su.ctx.Done():
 			return context.Cause(su.ctx)
@@ -817,6 +820,7 @@ func (su *ChunkedUpload) uploadProcessor() {
 				return
 			}
 			su.uploadToBlobbers(uploadData) //nolint:errcheck
+			logger.Logger.Info("upload_processor_complete: ", uploadData.chunkEndIndex, " ", uploadData.isFinal, " ", su.fileMeta.RemotePath)
 			su.uploadWG.Done()
 		}
 	}

diff --git a/zboxcore/sdk/multi_operation_worker.go b/zboxcore/sdk/multi_operation_worker.go
@@ -197,8 +197,12 @@ func (mo *MultiOperation) Process() error {
 	}
 	swg.Wait()
 
+	if ctx.Err() != nil {
+		return context.Cause(ctx)
+	}
+
 	// Check consensus
-	if mo.operationMask.CountOnes() < mo.consensusThresh || ctx.Err() != nil {
+	if mo.operationMask.CountOnes() < mo.consensusThresh {
 		majorErr := zboxutil.MajorError(errsSlice)
 		if majorErr != nil {
 			return errors.New("consensus_not_met",