Track PollErrorCount when polling for provider deal state

storagemarket/impl/clientstates/client_fsm.go

@@ -65,8 +65,11 @@ var ClientEvents = fsm.Events{
 		FromMany(storagemarket.StorageDealTransferring, storagemarket.StorageDealStartDataTransfer).To(storagemarket.StorageDealCheckForAcceptance),
 	fsm.Event(storagemarket.ClientEventWaitForDealState).
 		From(storagemarket.StorageDealCheckForAcceptance).ToNoChange().
-		Action(func(deal *storagemarket.ClientDeal) error {
+		Action(func(deal *storagemarket.ClientDeal, pollError bool) error {
 			deal.PollRetryCount += 1
+			if pollError {
+				deal.PollErrorCount += 1
+			}
 			return nil
 		}),
 	fsm.Event(storagemarket.ClientEventResponseDealDidNotMatch).

storagemarket/impl/clientstates/client_states.go

@@ -145,7 +145,7 @@ func CheckForDealAcceptance(ctx fsm.Context, environment ClientDealEnvironment,
 	dealState, err := environment.GetProviderDealState(ctx.Context(), deal.ProposalCid)
 	if err != nil {
 		log.Warnf("error when querying provider deal state: %w", err) // TODO: at what point do we fail the deal?
-		return waitAgain(ctx, environment, deal)
+		return waitAgain(ctx, environment, true)
 	}
 
 	if isFailed(dealState.State) {
@@ -160,16 +160,16 @@ func CheckForDealAcceptance(ctx fsm.Context, environment ClientDealEnvironment,
 		return ctx.Trigger(storagemarket.ClientEventDealAccepted, dealState.PublishCid)
 	}
 
-	return waitAgain(ctx, environment, deal)
+	return waitAgain(ctx, environment, false)
 }
 
-func waitAgain(ctx fsm.Context, environment ClientDealEnvironment, _ storagemarket.ClientDeal) error {
+func waitAgain(ctx fsm.Context, environment ClientDealEnvironment, pollError bool) error {
 	t := time.NewTimer(environment.PollingInterval())
 
 	go func() {
 		select {
 		case <-t.C:
-			_ = ctx.Trigger(storagemarket.ClientEventWaitForDealState)
+			_ = ctx.Trigger(storagemarket.ClientEventWaitForDealState, pollError)
 		case <-ctx.Context().Done():
 			t.Stop()
 			return

storagemarket/impl/clientstates/client_states_test.go

@@ -281,6 +281,7 @@ func TestCheckForDealAcceptance(t *testing.T) {
 			inspector: func(deal storagemarket.ClientDeal, env *fakeEnvironment) {
 				tut.AssertDealState(t, storagemarket.StorageDealCheckForAcceptance, deal.State)
 				assert.Equal(t, uint64(1), deal.PollRetryCount)
+				assert.Equal(t, uint64(1), deal.PollErrorCount)
 			},
 		})
 	})

storagemarket/types.go

@@ -105,6 +105,7 @@ type ClientDeal struct {
 	PublishMessage *cid.Cid
 	SlashEpoch     abi.ChainEpoch
 	PollRetryCount uint64
+	PollErrorCount uint64
 }
 
 // StorageDeal is a local combination of a proposal and a current deal state