Skip to content
Closed
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
6 changes: 5 additions & 1 deletion packages/shared/pkg/utils/resizable_semaphore.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ func (s *AdjustableSemaphore) Acquire(ctx context.Context, n int64) error {
}

// Wake ->cond.Wait when ctx is canceled.
stop := context.AfterFunc(ctx, s.cond.Broadcast)
stop := context.AfterFunc(ctx, func() {
s.mu.Lock()
defer s.mu.Unlock()
s.cond.Broadcast()
})
defer stop() // ensure we don’t leak the callback

for s.used+n > s.limit {
Expand Down
47 changes: 47 additions & 0 deletions packages/shared/pkg/utils/resizable_semaphore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"runtime"
"sync"
"testing"
"testing/synctest"
"time"

"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -274,6 +275,52 @@ func TestAcquireRespectsContextCancel(t *testing.T) {
}
}

type semaphoreCancelContext struct {
context.Context
cancel context.CancelFunc
}

func (c *semaphoreCancelContext) Err() error {
err := c.Context.Err()
if err == nil {
c.cancel()
runtime.Gosched()
}

return err
}

func TestAcquireCancellationBeforeWait(t *testing.T) {
t.Parallel()

synctest.Test(t, func(t *testing.T) {
for range 100 {
s, err := NewAdjustableSemaphore(1)
require.NoError(t, err)
require.True(t, s.TryAcquire(1))

ctx, cancel := context.WithCancel(t.Context())
cancelOnCheck := &semaphoreCancelContext{Context: ctx, cancel: cancel}
result := make(chan error, 1)
go func() { result <- s.Acquire(cancelOnCheck, 1) }()
synctest.Wait()
cancel()

select {
case err := <-result:
require.ErrorIs(t, err, context.Canceled)
default:
s.mu.Lock()
s.cond.Broadcast()
s.mu.Unlock()
synctest.Wait()
<-result
t.Fatal("Acquire missed cancellation before entering Wait")
}
}
})
}

// -----------------------------------------------------------------------------
// race-detector stress
// -----------------------------------------------------------------------------
Expand Down