fix: keep running the whole tipset task without cancel (#1219)

* Keep running the whole tipset task without cancel * Add error to errordetected --------- Co-authored-by: Terry <[email protected]>
filecoin-project · Jun 6, 2023 · b86896a · b86896a
1 parent bdf1d1c
commit b86896a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/chain/indexer/integrated/tipset/tipset.go b/chain/indexer/integrated/tipset/tipset.go
@@ -145,7 +145,6 @@ func (ti *TipSetIndexer) TipSet(ctx context.Context, ts *types.TipSet) (chan *Re
 				if res.Error != nil {
 					llt.Errorw("task returned with error", "error", res.Error.Error())
 					errCh <- res.Error
-					return
 				}
 				// processor is complete if we receive a result
 				executingTasks[res.Task] = true

diff --git a/tasks/fevm/blockheader/tasks.go b/tasks/fevm/blockheader/tasks.go
@@ -48,24 +48,27 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 	cid, err := executed.Key().Cid()
 	if err != nil {
 		log.Errorf("Error at getting cid: [%v] err: %v", cid, err)
-		return nil, report, err
+		report.ErrorsDetected = err
+		return nil, report, nil
 	}
 
 	hash, err := ethtypes.EthHashFromCid(cid)
 	if err != nil {
 		log.Errorf("Error at finding hash: [%v] err: %v", hash, err)
-		return nil, report, err
+		report.ErrorsDetected = err
+		return nil, report, nil
 	}
 
 	ethBlock, err := p.node.EthGetBlockByHash(ctx, hash, false)
 	if err != nil {
 		log.Errorf("EthGetBlockByHash: [hash: %v] err: %v", hash.String(), err)
-		return nil, report, err
+		report.ErrorsDetected = err
+		return nil, report, nil
 	}
 
 	if ethBlock.Number == 0 {
 		log.Warn("block number == 0")
-		return nil, report, err
+		return nil, report, nil
 	}
 	return &fevm.FEVMBlockHeader{
 		Height:           int64(executed.Height()),

diff --git a/tasks/fevm/contract/task.go b/tasks/fevm/contract/task.go
@@ -53,7 +53,8 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 
 	actorChanges, err := p.node.ActorStateChanges(ctx, current, executed)
 	if err != nil {
-		return nil, report, err
+		report.ErrorsDetected = err
+		return nil, report, nil
 	}
 
 	out := make(fevm.FEVMContractList, 0)
@@ -109,10 +110,8 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 	}
 
 	if len(errs) > 0 {
-		err = fmt.Errorf("%v", errs)
-	} else {
-		err = nil
+		report.ErrorsDetected = fmt.Errorf("%v", errs)
 	}
 
-	return model.PersistableList{out}, report, err
+	return model.PersistableList{out}, report, nil
 }
diff --git a/tasks/fevm/receipt/tasks.go b/tasks/fevm/receipt/tasks.go
@@ -55,7 +55,8 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 	messages, err := p.node.ChainGetMessagesInTipset(ctx, executed.Key())
 	if err != nil {
 		log.Errorf("Error at getting messages. ts: %v, height: %v, err: %v", executed.String(), executed.Height(), err)
-		return nil, report, err
+		report.ErrorsDetected = err
+		return nil, report, nil
 	}
 	errs := []error{}
 	out := make(fevm.FEVMReceiptList, 0)
@@ -115,10 +116,8 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 	}
 
 	if len(errs) > 0 {
-		err = fmt.Errorf("%v", errs)
-	} else {
-		err = nil
+		report.ErrorsDetected = fmt.Errorf("%v", errs)
 	}
 
-	return model.PersistableList{out}, report, err
+	return model.PersistableList{out}, report, nil
 }
diff --git a/tasks/fevm/transaction/tasks.go b/tasks/fevm/transaction/tasks.go
@@ -53,7 +53,8 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 	messages, err := p.node.ChainGetMessagesInTipset(ctx, executed.Key())
 	if err != nil {
 		log.Errorf("Error at getting messages. ts: %v, height: %v, err: %v", executed.String(), executed.Height(), err)
-		return nil, report, err
+		report.ErrorsDetected = err
+		return nil, report, nil
 	}
 	errs := []error{}
 	out := make(fevm.FEVMTransactionList, 0)
@@ -127,10 +128,8 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 	}
 
 	if len(errs) > 0 {
-		err = fmt.Errorf("%v", errs)
-	} else {
-		err = nil
+		report.ErrorsDetected = fmt.Errorf("%v", errs)
 	}
 
-	return model.PersistableList{out}, report, err
+	return model.PersistableList{out}, report, nil
 }