Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,7 @@ func (m *Manager[T]) next() {
m.logger.Debug("got task", "id", task.GetID())
go func() {
defer func() {
if task.GetState() == StateWaitingRetry {
m.queue.Push(task)
}
// Execute() handles all retries in the same worker, task is completed when it returns
m.workers.Put(worker)
m.next()
}()
Expand Down
54 changes: 33 additions & 21 deletions worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ type Worker[T Task] struct {

// Execute executes the task
func (w Worker[T]) Execute(task T) {
if isRetry(task) {
task.SetState(StateBeforeRetry)
if hook, ok := Task(task).(OnBeforeRetry); ok {
hook.OnBeforeRetry()
}
}
onError := func(err error) {
task.SetErr(err)
if errors.Is(err, context.Canceled) {
Expand All @@ -37,23 +31,41 @@ func (w Worker[T]) Execute(task T) {
task.SetState(StateFailed)
}
}
defer func() {
if err := recover(); err != nil {
log.Printf("error [%s] while run task [%s],stack trace:\n%s", err, task.GetID(), getCurrentGoroutineStack())
onError(NewErr(fmt.Sprintf("panic: %v", err)))
// Retry immediately in the same worker until success or max retry exhausted
for {
func() {
defer func() {
if err := recover(); err != nil {
log.Printf("error [%s] while run task [%s],stack trace:\n%s", err, task.GetID(), getCurrentGoroutineStack())
onError(NewErr(fmt.Sprintf("panic: %v", err)))
}
}()

if isRetry(task) {
task.SetState(StateBeforeRetry)
if hook, ok := Task(task).(OnBeforeRetry); ok {
hook.OnBeforeRetry()
}
}

task.SetState(StateRunning)
err := task.Run()
if err != nil {
onError(err)
return
}

task.SetState(StateSucceeded)
if onSucceeded, ok := Task(task).(OnSucceeded); ok {
onSucceeded.OnSucceeded()
}
task.SetErr(nil)
}()

if task.GetState() != StateWaitingRetry {
return
}
}()
task.SetState(StateRunning)
err := task.Run()
if err != nil {
onError(err)
return
}
task.SetState(StateSucceeded)
if onSucceeded, ok := Task(task).(OnSucceeded); ok {
onSucceeded.OnSucceeded()
}
task.SetErr(nil)
}

// WorkerPool is the pool of workers
Expand Down