Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated cherry pick of #3119: Fix/pipeline cron compensate #3251

Merged
merged 1 commit into from
Dec 2, 2021
Merged

Automated cherry pick of #3119: Fix/pipeline cron compensate #3251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/pipeline/services/pipelinesvc/cron.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ func (s *PipelineSvc) RunCronPipelineFunc(id uint64) {
return
}

// 如果当前触发时间小于定时开始时间，return
if pc.Extra.CronStartFrom != nil && cronTriggerTime.Before(*pc.Extra.CronStartFrom) {
// if trigger time less than cronStartFrom, return directly
if s.isCronShouldBeIgnored(pc) {
logrus.Warnf("crond: pipelineCronID: %d, triggered but ignored, triggerTime: %s, cronStartFrom: %s",
pc.ID, cronTriggerTime, *pc.Extra.CronStartFrom)
return
Expand Down
21 changes: 18 additions & 3 deletions modules/pipeline/services/pipelinesvc/cron_compensate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,21 @@ func (s *PipelineSvc) traverseDoCompensate(doCompensate func(cron spec.PipelineC
}

group := limit_sync_group.NewSemaphore(int(conf.CronCompensateConcurrentNumber()))
for i := range enabledCrons {
for _, pc := range enabledCrons {
if s.isCronShouldBeIgnored(pc) {
triggerTime := time.Now()
logrus.Warnf("crond compensator: pipelineCronID: %d, triggered compensate but ignored, triggerTime: %s, cronStartFrom: %s",
pc.ID, triggerTime, *pc.Extra.CronStartFrom)
continue
}
if sync {
doCompensate(enabledCrons[i])
doCompensate(pc)
} else {
group.Add(1)
go func(pc spec.PipelineCron) {
defer group.Done()
doCompensate(pc)
}(enabledCrons[i])
}(pc)
}
}
group.Wait()
Expand Down Expand Up @@ -464,3 +470,12 @@ func (s *PipelineSvc) createCronCompensatePipeline(pc spec.PipelineCron, trigger
},
})
}

// isCronShouldIgnore if trigger time before cron start from time, should ignore cron at this trigger time
func (s *PipelineSvc) isCronShouldBeIgnored(pc spec.PipelineCron) bool {
if pc.Extra.CronStartFrom == nil {
return false
}
triggerTime := time.Now()
return triggerTime.Before(*pc.Extra.CronStartFrom)
}
11 changes: 11 additions & 0 deletions modules/pipeline/services/pipelinesvc/cron_compensate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,14 @@ func TestGetTriggeredTime(t *testing.T) {
triggerTime := getTriggeredTime(p)
assert.Equal(t, now.Unix(), triggerTime.Unix())
}

func Test_isCronShouldBeIgnored(t *testing.T) {
emptyStartTimeCron := spec.PipelineCron{}
startTime := time.Date(2099, 1, 1, 1, 1, 1, 1, time.Local)
startTimeCron := spec.PipelineCron{Extra: spec.PipelineCronExtra{
CronStartFrom: &startTime,
}}
svc := PipelineSvc{}
assert.Equal(t, false, svc.isCronShouldBeIgnored(emptyStartTimeCron))
assert.Equal(t, true, svc.isCronShouldBeIgnored(startTimeCron))
}