From 66a6ba503ae19cca4e65c1f237d12cfa0ca2cb77 Mon Sep 17 00:00:00 2001 From: leobot Date: Tue, 17 Nov 2026 14:54:16 +0800 Subject: [PATCH] fix(scheduling): release concurrency slot on hydration failure --- .../internal/service/gateway_scheduling.go | 4 ++ .../gateway_scheduling_slot_release_test.go | 50 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 backend/internal/service/gateway_scheduling_slot_release_test.go diff --git a/backend/internal/service/gateway_scheduling.go b/backend/internal/service/gateway_scheduling.go index fe8574026e8b..e65703947113 100644 --- a/backend/internal/service/gateway_scheduling.go +++ b/backend/internal/service/gateway_scheduling.go @@ -1530,6 +1530,10 @@ func (s *GatewayService) hydrateSelectedAccount(ctx context.Context, account *Ac func (s *GatewayService) newSelectionResult(ctx context.Context, account *Account, acquired bool, release func(), waitPlan *AccountWaitPlan) (*AccountSelectionResult, error) { hydrated, err := s.hydrateSelectedAccount(ctx, account) if err != nil { + // Release the acquired slot when hydration fails before the caller receives it. + if release != nil { + release() + } return nil, err } return attachSelectionProfitGate(ctx, &AccountSelectionResult{ diff --git a/backend/internal/service/gateway_scheduling_slot_release_test.go b/backend/internal/service/gateway_scheduling_slot_release_test.go new file mode 100644 index 000000000000..8f1e4cb1c8cd --- /dev/null +++ b/backend/internal/service/gateway_scheduling_slot_release_test.go @@ -0,0 +1,50 @@ +//go:build unit + +package service + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" +) + +// hydrate 失败时,已经占用的并发槽位必须在返回前释放,否则调用方拿不到 +// ReleaseFunc,槽位会一直泄漏到 TTL 到期。 +func TestGatewayServiceNewSelectionResultReleasesSlotOnHydrationError(t *testing.T) { + svc := &GatewayService{ + schedulerSnapshot: &SchedulerSnapshotService{}, + } + + ctx, cancel := context.WithCancel(context.Background()) + cancel() + + released := 0 + selection, err := svc.newSelectionResult(ctx, &Account{ID: 42}, true, func() { released++ }, nil) + + require.Error(t, err) + require.Nil(t, selection) + require.Equal(t, 1, released) +} + +// hydrate 成功时不能提前释放槽位,ReleaseFunc 应原样交给调用方。 +func TestGatewayServiceNewSelectionResultKeepsReleaseOnSuccess(t *testing.T) { + account := &Account{ID: 42, Platform: PlatformAnthropic} + cache := &snapshotHydrationCache{ + accounts: map[int64]*Account{account.ID: account}, + } + svc := &GatewayService{ + schedulerSnapshot: NewSchedulerSnapshotService(cache, nil, nil, nil, nil), + } + + released := 0 + selection, err := svc.newSelectionResult(context.Background(), account, true, func() { released++ }, nil) + + require.NoError(t, err) + require.NotNil(t, selection) + require.Zero(t, released) + require.NotNil(t, selection.ReleaseFunc) + + selection.ReleaseFunc() + require.Equal(t, 1, released) +}