Merge pull request #1539 from 0chain/fix/status-error

call status error callback
0chain · Jun 21, 2024 · 279a3b3 · 279a3b3
2 parents a4c103a + b19fa83
commit 279a3b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/zboxcore/sdk/multi_operation_worker.go b/zboxcore/sdk/multi_operation_worker.go
@@ -198,7 +198,8 @@ func (mo *MultiOperation) Process() error {
 	swg.Wait()
 
 	if ctx.Err() != nil {
-		return context.Cause(ctx)
+		err := context.Cause(ctx)
+		return err
 	}
 
 	// Check consensus

diff --git a/zboxcore/sdk/rollback.go b/zboxcore/sdk/rollback.go
@@ -291,7 +291,7 @@ func (a *Allocation) CheckAllocStatus() (AllocStatus, []BlobberStatus, error) {
 	}
 	wg.Wait()
 	close(markerChan)
-	if a.ParityShards > 0 && errCnt > int32(a.ParityShards) {
+	if (a.ParityShards > 0 && errCnt > int32(a.ParityShards)) || (a.ParityShards == 0 && errCnt > 0) {
 		return Broken, blobberRes, common.NewError("check_alloc_status_failed", markerError.Error())
 	}
 
@@ -328,12 +328,12 @@ func (a *Allocation) CheckAllocStatus() (AllocStatus, []BlobberStatus, error) {
 		versionMap[version] = append(versionMap[version], rb)
 	}
 
-	if len(versionMap) < 2 {
+	req := a.DataShards
+
+	if len(versionMap) == 0 {
 		return Commit, blobberRes, nil
 	}
 
-	req := a.DataShards
-
 	if len(versionMap[latestVersion]) > req || len(versionMap[prevVersion]) > req {
 		return Commit, blobberRes, nil
 	}