Merge pull request #1424 from 0chain/hotfix/retry-check

dabasov · web-flow · commit e1543b476d7f · 2024-05-20T16:04:06.000+03:00
Fix retry check
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) {

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ func tryAgain(md *markerData) {`
`256`	`256`
`257`	`257`	`// Can add more cases where we don't want to retry`
`258`	`258`	`func retryRedeem(errString string) bool {`
`259`		`- return !strings.Contains(errString, "value not present") \|\| !strings.Contains(errString, "Blobber is not part of the allocation")`
	`259`	`+ return !strings.Contains(errString, "value not present") && !strings.Contains(errString, "Blobber is not part of the allocation")`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`func startCollector(ctx context.Context) {`