Merge pull request #1525 from 0chain/hotfix/delete-race

fix race condition in process delete
0chain · Jun 13, 2024 · 0afd9fd · 0afd9fd
2 parents d7bac27 + 0423cf0
commit 0afd9fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/zboxcore/sdk/commitworker.go b/zboxcore/sdk/commitworker.go
@@ -234,8 +234,8 @@ func (req *CommitRequest) commitBlobber(
 		wm.PreviousAllocationRoot = ""
 	}
 	if wm.AllocationRoot == wm.PreviousAllocationRoot {
-		l.Logger.Error("Allocation root and previous allocation root are same")
-		return thrown.New("commit_error", "Allocation root and previous allocation root are same")
+		l.Logger.Debug("Allocation root and previous allocation root are same")
+		return nil
 	}
 	wm.ChainHash = chainHash
 	wm.FileMetaRoot = rootRef.FileMetaHash

diff --git a/zboxcore/sdk/deleteworker.go b/zboxcore/sdk/deleteworker.go
@@ -329,7 +329,7 @@ func (dop *DeleteOperation) Process(allocObj *Allocation, connectionID string) (
 		deleteReq.wg.Add(1)
 		go func(blobberIdx int) {
 			defer deleteReq.wg.Done()
-			refEntity, err := deleteReq.getObjectTreeFromBlobber(pos)
+			refEntity, err := deleteReq.getObjectTreeFromBlobber(uint64(blobberIdx))
 			if errors.Is(err, constants.ErrNotFound) {
 				deleteReq.consensus.Done()
 				return