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
12 changes: 12 additions & 0 deletions pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,24 @@ func (p *pool) worker(task any) {

func (p *pool) subpoolWorker(task any) func() (output any, err error) {
return func() (output any, err error) {
exitedNormally := false
defer func() {
if !exitedNormally {
p.updateMetrics(fmt.Errorf("worker exited abnormally: %w", err))
if nextTask, readErr := p.readTask(); readErr == nil {
p.launchWorker(nextTask)
}
}
}()

if task != nil {
output, err = invokeTask[any](task, p.panicRecovery)

p.updateMetrics(err)
}

exitedNormally = true

// Attempt to submit the next task to the parent pool
if task, err := p.readTask(); err == nil {
for {
Expand Down
52 changes: 52 additions & 0 deletions subpool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package pond
import (
"context"
"errors"
"runtime"
"sync"
"sync/atomic"
"testing"
Expand Down Expand Up @@ -467,3 +468,54 @@ func TestSubpoolResize(t *testing.T) {

pool.Stop().Wait()
}

func TestSubpoolRecoversAfterGoexit(t *testing.T) {
for _, nested := range []bool{false, true} {
name := "direct"
if nested {
name = "nested"
}
t.Run(name, func(t *testing.T) {
parent := NewPool(1)
defer parent.StopAndWait()
subpool := parent.NewSubpool(1)
var intermediate Pool
if nested {
intermediate = subpool
subpool = intermediate.NewSubpool(1)
}

started := make(chan struct{})
release := make(chan struct{})
aborted := subpool.Submit(func() {
close(started)
<-release
runtime.Goexit()
})
<-started
next := subpool.Submit(func() {})
close(release)

done := make(chan struct{})
go func() {
subpool.StopAndWait()
close(done)
}()
select {
case <-done:
case <-time.After(time.Second):
t.Fatal("subpool did not recover after runtime.Goexit")
}

assert.Equal(t, ErrPoolStopped, aborted.Wait())
assert.Equal(t, nil, next.Wait())
assert.Equal(t, int64(0), subpool.RunningWorkers())
assert.Equal(t, uint64(0), subpool.WaitingTasks())
assert.Equal(t, uint64(1), subpool.FailedTasks())
assert.Equal(t, uint64(1), subpool.SuccessfulTasks())
if intermediate != nil {
intermediate.StopAndWait()
}
})
}
}
Loading