Skip to content

tasklist: fix deadlocks #1529

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

Merged
neolynx merged 1 commit into from
Jan 20, 2026
Merged

tasklist: fix deadlocks #1529

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
15 changes: 12 additions & 3 deletions task/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,25 @@ func (list *List) consumer() {
task.wgTask.Done()
list.wg.Done()

unlocked := false
for _, t := range list.tasks {
if t.State == IDLE {
// check resources
blockingTasks := list.usedResources.UsedBy(t.resources)
if len(blockingTasks) == 0 {
list.usedResources.MarkInUse(task.resources, task)
list.usedResources.MarkInUse(t.resources, t)
// unlock list since queueing may block
list.Unlock()
unlocked = true
list.queue <- t
break
}
}
}
if !unlocked {
list.Unlock()
}
}
list.Unlock()
}()

case <-list.queueDone:
Expand Down Expand Up @@ -187,7 +193,6 @@ func (list *List) GetTaskReturnValueByID(ID int) (*ProcessReturnValue, error) {
// become available.
func (list *List) RunTaskInBackground(name string, resources []string, process Process) (Task, *ResourceConflictError) {
list.Lock()
defer list.Unlock()

list.idCounter++
wgTask := &sync.WaitGroup{}
Expand All @@ -204,7 +209,11 @@ func (list *List) RunTaskInBackground(name string, resources []string, process P
tasks := list.usedResources.UsedBy(resources)
if len(tasks) == 0 {
list.usedResources.MarkInUse(task.resources, task)
// queueing task might block if channel not ready, unlock list before queueing
list.Unlock()
list.queue <- task
} else {
list.Unlock()
}

return *task, nil
Expand Down
Loading