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

ttl: reschedule scan tasks after update task state #39891

Merged
merged 7 commits into from
Dec 13, 2022
Merged

ttl: reschedule scan tasks after update task state #39891

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ace00e
reschedule scan tasks after update task state
YangKeao Dec 13, 2022
a8a4ab8
Merge branch 'master' into ttl-reschedule-after-finish
YangKeao Dec 13, 2022
a4d6b25
Merge branch 'master' into ttl-reschedule-after-finish
ti-chi-bot Dec 13, 2022
9cc39cc
Merge branch 'master' into ttl-reschedule-after-finish
hawkingrei Dec 13, 2022
8685d25
Merge branch 'master' into ttl-reschedule-after-finish
hawkingrei Dec 13, 2022
c69f3b2
Merge branch 'master' into ttl-reschedule-after-finish
ti-chi-bot Dec 13, 2022
eb63355
Merge branch 'master' into ttl-reschedule-after-finish
ti-chi-bot Dec 13, 2022
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
13 changes: 10 additions & 3 deletions ttl/ttlworker/job_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,13 @@ func (m *JobManager) jobLoop() error {
}
cancel()
case <-updateScanTaskStateTicker:
m.updateTaskState()
if m.updateTaskState() {
m.rescheduleJobs(se, now)
}
case <-m.notifyStateCh:
m.updateTaskState()
if m.updateTaskState() {
m.rescheduleJobs(se, now)
}
case <-jobCheckTicker:
m.checkFinishedJob(se, now)
m.checkNotOwnJob()
Expand Down Expand Up @@ -229,7 +233,8 @@ func (m *JobManager) resizeWorkers(workers []worker, count int, factory func() w
return workers, nil
}

func (m *JobManager) updateTaskState() {
// updateTaskState polls the result from scan worker and returns whether there are result polled
func (m *JobManager) updateTaskState() bool {
results := m.pollScanWorkerResults()
for _, result := range results {
job := findJobWithTableID(m.runningJobs, result.task.tbl.ID)
Expand All @@ -240,6 +245,8 @@ func (m *JobManager) updateTaskState() {
job.scanTaskErr = multierr.Append(job.scanTaskErr, result.err)
}
}

return len(results) > 0
}

func (m *JobManager) pollScanWorkerResults() []*ttlScanTaskExecResult {
Expand Down