use backoff retry

c9s · Mar 14, 2024 · f29a4be · f29a4be
1 parent f19eceb
commit f29a4be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/pkg/strategy/dca2/state.go b/pkg/strategy/dca2/state.go
@@ -201,7 +201,7 @@ func (s *Strategy) runTakeProfitReady(ctx context.Context, next State) {
 	// reset position
 
 	// calculate profit stats
-	if err := s.mustCalculateAndEmitProfit(ctx); err != nil {
+	if err := s.CalculateAndEmitProfitUntilSuccessful(ctx); err != nil {
 		s.logger.WithError(err).Warn("failed to calculate and emit profit")
 	}
 

diff --git a/pkg/strategy/dca2/strategy.go b/pkg/strategy/dca2/strategy.go
@@ -8,6 +8,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
 	"go.uber.org/multierr"
@@ -372,7 +373,7 @@ func (s *Strategy) CleanUp(ctx context.Context) error {
 	return werr
 }
 
-func (s *Strategy) mustCalculateAndEmitProfit(ctx context.Context) error {
+func (s *Strategy) CalculateAndEmitProfitUntilSuccessful(ctx context.Context) error {
 	fromOrderID := s.ProfitStats.FromOrderID
 
 	historyService, ok := s.ExchangeSession.Exchange.(types.ExchangeTradeHistoryService)
@@ -385,23 +386,19 @@ func (s *Strategy) mustCalculateAndEmitProfit(ctx context.Context) error {
 		return fmt.Errorf("exchange %s doesn't support ExchangeOrderQueryService", s.ExchangeSession.Exchange.Name())
 	}
 
-	maxTry := 10
-	for try := 1; try < maxTry; try++ {
+	var op = func() error {
 		if err := s.CalculateAndEmitProfit(ctx, historyService, queryService); err != nil {
-			s.logger.WithError(err).Warnf("failed to calculate and emit profit at #%d try, please check it", try)
-			continue
+			return errors.Wrapf(err, "failed to calculate and emit profit, please check it")
 		}
 
-		if s.ProfitStats.FromOrderID > fromOrderID {
-			break
+		if s.ProfitStats.FromOrderID == fromOrderID {
+			return fmt.Errorf("FromOrderID (%d) is not updated, retry it", s.ProfitStats.FromOrderID)
 		}
-	}
 
-	if s.ProfitStats.FromOrderID == fromOrderID {
-		return fmt.Errorf("after trying %d times, we still can't calculate and emit profit, please check it", maxTry)
+		return nil
 	}
 
-	return nil
+	return retry.GeneralLiteBackoff(ctx, op)
 }
 
 func (s *Strategy) CalculateAndEmitProfit(ctx context.Context, historyService types.ExchangeTradeHistoryService, queryService types.ExchangeOrderQueryService) error {