1
0
镜像自地址 https://github.com/tuna/tunasync.git 已同步 2025-12-06 14:36:47 +00:00

fix(worker): fixed scheduling bugs

这个提交包含在:
bigeagle
2016-05-02 18:22:23 +08:00
父节点 51fa12900d
当前提交 65984053eb
共有 3 个文件被更改,包括 40 次插入7 次删除

查看文件

@@ -12,6 +12,7 @@ import (
type scheduleQueue struct {
sync.Mutex
list *skiplist.SkipList
jobs map[string]bool
}
func timeLessThan(l, r interface{}) bool {
@@ -23,12 +24,18 @@ func timeLessThan(l, r interface{}) bool {
func newScheduleQueue() *scheduleQueue {
queue := new(scheduleQueue)
queue.list = skiplist.NewCustomMap(timeLessThan)
queue.jobs = make(map[string]bool)
return queue
}
func (q *scheduleQueue) AddJob(schedTime time.Time, job *mirrorJob) {
q.Lock()
defer q.Unlock()
if _, ok := q.jobs[job.Name()]; ok {
logger.Warningf("Job %s already scheduled, removing the existing one", job.Name())
q.unsafeRemove(job.Name())
}
q.jobs[job.Name()] = true
q.list.Set(schedTime, job)
logger.Debugf("Added job %s @ %v", job.Name(), schedTime)
}
@@ -45,10 +52,11 @@ func (q *scheduleQueue) Pop() *mirrorJob {
defer first.Close()
t := first.Key().(time.Time)
// logger.Debug("First job should run @%v", t)
if t.Before(time.Now()) {
job := first.Value().(*mirrorJob)
q.list.Delete(first.Key())
delete(q.jobs, job.Name())
logger.Debug("Popped out job %s @%v", job.Name(), t)
return job
}
return nil
@@ -58,7 +66,11 @@ func (q *scheduleQueue) Pop() *mirrorJob {
func (q *scheduleQueue) Remove(name string) bool {
q.Lock()
defer q.Unlock()
return q.unsafeRemove(name)
}
// remove job
func (q *scheduleQueue) unsafeRemove(name string) bool {
cur := q.list.Iterator()
defer cur.Close()
@@ -66,6 +78,7 @@ func (q *scheduleQueue) Remove(name string) bool {
cj := cur.Value().(*mirrorJob)
if cj.Name() == name {
q.list.Delete(cur.Key())
delete(q.jobs, name)
return true
}
}