From bead7eacd233e302a896944734bb823d03e11bf5 Mon Sep 17 00:00:00 2001 From: liuziba Date: Sat, 9 Dec 2023 06:52:41 +0000 Subject: [PATCH 1/3] Ignore error for making identical deals --- service/dealpusher/dealpusher.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/service/dealpusher/dealpusher.go b/service/dealpusher/dealpusher.go index 4d9df5f4b..07501ee6e 100644 --- a/service/dealpusher/dealpusher.go +++ b/service/dealpusher/dealpusher.go @@ -2,6 +2,7 @@ package dealpusher import ( "context" + "strings" "sync" "time" @@ -374,7 +375,7 @@ func (d *DealPusher) runSchedule(ctx context.Context, schedule *model.Schedule) PricePerGB: schedule.PricePerGB, PricePerGBEpoch: schedule.PricePerGBEpoch, }) - if err != nil { + if err != nil && !strings.Contains(err.Error(), "deal proposal is identical") { Logger.Errorw("failed to send deal", "error", err, "provider", schedule.Provider) } return errors.WithStack(err) From 705aa3dcc9bba04eef1df477b08c74abc7a7f64a Mon Sep 17 00:00:00 2001 From: liuziba Date: Sat, 9 Dec 2023 18:00:57 +0000 Subject: [PATCH 2/3] fix --- service/dealpusher/dealpusher.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/service/dealpusher/dealpusher.go b/service/dealpusher/dealpusher.go index 07501ee6e..d57cb1dbe 100644 --- a/service/dealpusher/dealpusher.go +++ b/service/dealpusher/dealpusher.go @@ -375,9 +375,13 @@ func (d *DealPusher) runSchedule(ctx context.Context, schedule *model.Schedule) PricePerGB: schedule.PricePerGB, PricePerGBEpoch: schedule.PricePerGBEpoch, }) - if err != nil && !strings.Contains(err.Error(), "deal proposal is identical") { + if err != nil { Logger.Errorw("failed to send deal", "error", err, "provider", schedule.Provider) + if strings.Contains(err.Error(), "deal proposal is identical") { + return nil + } } + return errors.WithStack(err) }, retry.Attempts(d.sendDealAttempts), retry.Delay(time.Second), retry.DelayType(retry.FixedDelay), retry.Context(ctx)) @@ -385,6 +389,9 @@ func (d *DealPusher) runSchedule(ctx context.Context, schedule *model.Schedule) return "", errors.Wrap(err, "failed to send deal") } + if dealModel == nil { + continue + } dealModel.ScheduleID = &schedule.ID Logger.Debugw("save accepted deal", "deal", dealModel) From 51d08243318f3b207bca55ecb5c5d4e023810ef3 Mon Sep 17 00:00:00 2001 From: Xinan Xu <39632914+xinaxu@users.noreply.github.com> Date: Sat, 9 Dec 2023 11:13:10 -0800 Subject: [PATCH 3/3] lint --- service/dealpusher/dealpusher.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/service/dealpusher/dealpusher.go b/service/dealpusher/dealpusher.go index d57cb1dbe..5d2e1e7e5 100644 --- a/service/dealpusher/dealpusher.go +++ b/service/dealpusher/dealpusher.go @@ -377,9 +377,9 @@ func (d *DealPusher) runSchedule(ctx context.Context, schedule *model.Schedule) }) if err != nil { Logger.Errorw("failed to send deal", "error", err, "provider", schedule.Provider) - if strings.Contains(err.Error(), "deal proposal is identical") { - return nil - } + if strings.Contains(err.Error(), "deal proposal is identical") { + return nil + } } return errors.WithStack(err) @@ -389,9 +389,9 @@ func (d *DealPusher) runSchedule(ctx context.Context, schedule *model.Schedule) return "", errors.Wrap(err, "failed to send deal") } - if dealModel == nil { - continue - } + if dealModel == nil { + continue + } dealModel.ScheduleID = &schedule.ID Logger.Debugw("save accepted deal", "deal", dealModel)