Skip to content

Commit f4f9960

Browse files
authored
micro deadlock fix (#819)
Signed-off-by: Pavel Okhlopkov <[email protected]>
1 parent d2fe67c commit f4f9960

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pkg/task/queue/task_queue_list.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,10 @@ func (q *TaskQueue) RemoveLast() task.Task {
668668
defer q.MeasureActionTime("RemoveLast")()
669669
var t task.Task
670670

671+
if q.isEmpty() {
672+
return nil
673+
}
674+
671675
q.withLock(func() {
672676
t = q.removeLast()
673677
})
@@ -677,10 +681,6 @@ func (q *TaskQueue) RemoveLast() task.Task {
677681

678682
// removeLast deletes a tail element, so tail is moved.
679683
func (q *TaskQueue) removeLast() task.Task {
680-
if q.isEmpty() {
681-
return nil
682-
}
683-
684684
element := q.items.Back()
685685
t := q.items.Remove(element)
686686
delete(q.idIndex, t.GetId())

0 commit comments

Comments
 (0)