@@ -153,7 +153,7 @@ func (m *JobManager) jobLoop() error {
153
153
154
154
scheduleTaskTicker := time .Tick (getTaskManagerLoopTickerInterval ())
155
155
updateTaskHeartBeatTicker := time .Tick (ttlTaskHeartBeatTickerInterval )
156
- taskCheckTicker := time .Tick (getTaskManagerLoopTickerInterval () )
156
+ taskCheckTicker := time .Tick (time . Second * 5 )
157
157
checkScanTaskFinishedTicker := time .Tick (getTaskManagerLoopTickerInterval ())
158
158
159
159
cmdWatcher := m .cmdCli .WatchCommand (m .ctx )
@@ -535,6 +535,7 @@ func (m *JobManager) couldTrySchedule(tableStatus *cache.TableStatus, table *cac
535
535
// It could be nil, nil, if the table query doesn't return error but the job has been locked by other instances.
536
536
func (m * JobManager ) lockNewJob (ctx context.Context , se session.Session , table * cache.PhysicalTable , now time.Time , ignoreScheduleInterval bool ) (* ttlJob , error ) {
537
537
var expireTime time.Time
538
+ var jobID string
538
539
539
540
err := se .RunInTxn (ctx , func () error {
540
541
sql , args := cache .SelectFromTTLTableStatusWithID (table .ID )
@@ -574,7 +575,7 @@ func (m *JobManager) lockNewJob(ctx context.Context, se session.Session, table *
574
575
return err
575
576
}
576
577
577
- jobID : = uuid .New ().String ()
578
+ jobID = uuid .New ().String ()
578
579
jobExist := false
579
580
if len (tableStatus .CurrentJobID ) > 0 {
580
581
// don't create new job if there is already one running
@@ -629,7 +630,7 @@ func (m *JobManager) lockNewJob(ctx context.Context, se session.Session, table *
629
630
return nil , err
630
631
}
631
632
632
- job := m .createNewJob (expireTime , now , table )
633
+ job := m .createNewJob (jobID , expireTime , now , table )
633
634
634
635
// job is created, notify every scan managers to fetch new tasks
635
636
err = m .notificationCli .Notify (m .ctx , scanTaskNotificationType , job .id )
@@ -639,9 +640,7 @@ func (m *JobManager) lockNewJob(ctx context.Context, se session.Session, table *
639
640
return job , nil
640
641
}
641
642
642
- func (m * JobManager ) createNewJob (expireTime time.Time , now time.Time , table * cache.PhysicalTable ) * ttlJob {
643
- id := m .tableStatusCache .Tables [table .ID ].CurrentJobID
644
-
643
+ func (m * JobManager ) createNewJob (id string , expireTime time.Time , now time.Time , table * cache.PhysicalTable ) * ttlJob {
645
644
return & ttlJob {
646
645
id : id ,
647
646
ownerID : m .id ,
0 commit comments