Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-23 15:21:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11473 from steven-zou/fix/issue_#11466

Browse Source 
fix[jobservice]:enqueue job with UTC
This commit is contained in:
Steven Zou 2020-04-08 08:44:43 +08:00 committed by GitHub
commit 76625eab54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jobservice/period/enqueuer.go
View File

@ -33,7 +33,6 @@ import (
const (
enqueuerSleep = 2 * time.Minute
enqueuerHorizon = 4 * time.Minute
neverExecuted = 365 * 24 * time.Hour
// PeriodicExecutionMark marks the scheduled job to a periodic execution
PeriodicExecutionMark = "_job_kind_periodic_"
@ -89,9 +88,6 @@ func (e *enqueuer) loop() {
case <-e.context.Done():
return // exit
case <-timer.C:
// Pause the timer for completing the processing this time
timer.Reset(neverExecuted)
// Check and enqueue.
// Set next turn with lower priority to balance workload with long
// round time if it hits.
@ -158,7 +154,8 @@ func (e *enqueuer) enqueue() {
// scheduleNextJobs schedules job for next time slots based on the policy
func (e *enqueuer) scheduleNextJobs(p *Policy, conn redis.Conn) {
nowTime := time.Unix(time.Now().Unix(), 0)
// Follow UTC time spec
nowTime := time.Unix(time.Now().UTC().Unix(), 0).UTC()
horizon := nowTime.Add(enqueuerHorizon)
schedule, err := cron.Parse(p.CronSpec)