fix: handle not found errors in pdcleaner (#1905)

* handle not found

* run at start up

* update itest startEpoch

* ensure deal starts in itest

* fix lint error

Author: LexLuthr

itests/framework/framework.go

@@ -635,7 +635,7 @@ func (f *TestFramework) MakeDummyDeal(dealUuid uuid.UUID, carFilepath string, ro
 	if err != nil {
 		return nil, fmt.Errorf("getting chain head: %w", err)
 	}
-	startEpoch := head.Height() + abi.ChainEpoch(600)
+	startEpoch := head.Height() + abi.ChainEpoch(1000)
 	l, err := market.NewLabelFromString(rootCid.String())
 	if err != nil {
 		return nil, err

itests/lid_cleanup_test.go

@@ -175,7 +175,7 @@ func TestLIDCleanup(t *testing.T) {
 	head, err := f.FullNode.ChainHead(ctx)
 	require.NoError(t, err)
 
-	startEpoch := head.Height() + 200
+	startEpoch := head.Height() + 1000
 	endEpoch := head.Height() + +2880*400
 
 	dealUuid := uuid.New()
@@ -275,6 +275,25 @@ func TestLIDCleanup(t *testing.T) {
 		return len(stateList) == 2
 	}, time.Second*15, 1*time.Second, "timeout waiting for sectors to reach TerminateFinality")
 
+	var bigger abi.ChainEpoch
+
+	bigger = res2.DealParams.ClientDealProposal.Proposal.StartEpoch
+
+	if res1.DealParams.ClientDealProposal.Proposal.StartEpoch > res2.DealParams.ClientDealProposal.Proposal.StartEpoch {
+		bigger = res1.DealParams.ClientDealProposal.Proposal.StartEpoch
+	}
+
+	if bigger < ddParams.StartEpoch {
+		bigger = ddParams.StartEpoch
+	}
+
+	// Wait till all deal start epochs have passed
+	require.Eventuallyf(t, func() bool {
+		h, err := f.FullNode.ChainHead(ctx)
+		require.NoError(t, err)
+		return h.Height() > bigger
+	}, time.Minute*5, time.Second, "timeout waiting for start epochs")
+
 	// Clean up LID
 	err = f.Boost.PdCleanup(ctx)
 	require.NoError(t, err)

lib/pdcleaner/pdcleaner.go

@@ -2,6 +2,7 @@ package pdcleaner
 
 import (
 	"fmt"
+	"strings"
 	"sync"
 	"time"
 
@@ -98,6 +99,12 @@ func (p *pdcleaner) Start(ctx context.Context) {
 }
 
 func (p *pdcleaner) clean() {
+	// Run at start up
+	log.Infof("Starting LID clean up")
+	serr := p.CleanOnce(p.ctx)
+	log.Errorf("Failed to cleanup LID: %s", serr)
+	log.Debugf("Finished cleaning up LID")
+
 	// Create a ticker with an hour tick
 	ticker := time.NewTicker(p.cleanupInterval)
 	defer ticker.Stop()
@@ -173,7 +180,9 @@ func (p *pdcleaner) CleanOnce(ctx context.Context) error {
 			if !present && deal.ClientDealProposal.Proposal.StartEpoch < head.Height() {
 				err = p.pd.RemoveDealForPiece(ctx, deal.ClientDealProposal.Proposal.PieceCID, deal.DealUuid.String())
 				if err != nil {
-					// Don't return if cleaning up a deal results in error. Try them all.
+					if strings.Contains(err.Error(), "not found") {
+						return nil
+					}
 					return fmt.Errorf("cleaning up boost deal %s for piece %s: %s", deal.DealUuid.String(), deal.ClientDealProposal.Proposal.PieceCID.String(), err.Error())
 				}
 			}
@@ -198,7 +207,9 @@ func (p *pdcleaner) CleanOnce(ctx context.Context) error {
 			if !present {
 				err = p.pd.RemoveDealForPiece(ctx, deal.ClientDealProposal.Proposal.PieceCID, deal.ProposalCid.String())
 				if err != nil {
-					// Don't return if cleaning up a deal results in error. Try them all.
+					if strings.Contains(err.Error(), "not found") {
+						return nil
+					}
 					return fmt.Errorf("cleaning up legacy deal %s for piece %s: %s", deal.ProposalCid.String(), deal.ClientDealProposal.Proposal.PieceCID.String(), err.Error())
 				}
 			}
@@ -224,7 +235,9 @@ func (p *pdcleaner) CleanOnce(ctx context.Context) error {
 			if !present {
 				err = p.pd.RemoveDealForPiece(ctx, deal.PieceCID, deal.ID.String())
 				if err != nil {
-					// Don't return if cleaning up a deal results in error. Try them all.
+					if strings.Contains(err.Error(), "not found") {
+						return nil
+					}
 					return fmt.Errorf("cleaning up direct deal %s for piece %s: %s", deal.ID.String(), deal.PieceCID, err.Error())
 				}
 			}
@@ -281,7 +294,9 @@ func (p *pdcleaner) CleanOnce(ctx context.Context) error {
 
 					err = p.pd.RemoveDealForPiece(ctx, piece, deal.DealUuid)
 					if err != nil {
-						// Don't return if cleaning up a deal results in error. Try them all.
+						if strings.Contains(err.Error(), "not found") {
+							return nil
+						}
 						log.Errorf("cleaning up dangling deal %s for piece %s: %s", deal.DealUuid, piece, err.Error())
 					}
 				}