mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-03-30 04:05:29 +00:00
a88698f3fc
When the service restarts, concurrency slots from the old process remain in Redis, causing phantom occupancy. On startup, scan all concurrency sorted sets and remove members with non-current process prefix, then clear orphaned wait queue counters. Uses Go-side SCAN to discover keys (compatible with Redis client prefix hooks in tests), then passes them to a Lua script for atomic member-level cleanup. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
127 lines
4.3 KiB
Go
127 lines
4.3 KiB
Go
package handler
|
|
|
|
import (
|
|
"context"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
type concurrencyCacheMock struct {
|
|
acquireUserSlotFn func(ctx context.Context, userID int64, maxConcurrency int, requestID string) (bool, error)
|
|
acquireAccountSlotFn func(ctx context.Context, accountID int64, maxConcurrency int, requestID string) (bool, error)
|
|
releaseUserCalled int32
|
|
releaseAccountCalled int32
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) AcquireAccountSlot(ctx context.Context, accountID int64, maxConcurrency int, requestID string) (bool, error) {
|
|
if m.acquireAccountSlotFn != nil {
|
|
return m.acquireAccountSlotFn(ctx, accountID, maxConcurrency, requestID)
|
|
}
|
|
return false, nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) ReleaseAccountSlot(ctx context.Context, accountID int64, requestID string) error {
|
|
atomic.AddInt32(&m.releaseAccountCalled, 1)
|
|
return nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) GetAccountConcurrency(ctx context.Context, accountID int64) (int, error) {
|
|
return 0, nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) GetAccountConcurrencyBatch(ctx context.Context, accountIDs []int64) (map[int64]int, error) {
|
|
result := make(map[int64]int, len(accountIDs))
|
|
for _, accountID := range accountIDs {
|
|
result[accountID] = 0
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) IncrementAccountWaitCount(ctx context.Context, accountID int64, maxWait int) (bool, error) {
|
|
return true, nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) DecrementAccountWaitCount(ctx context.Context, accountID int64) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) GetAccountWaitingCount(ctx context.Context, accountID int64) (int, error) {
|
|
return 0, nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) AcquireUserSlot(ctx context.Context, userID int64, maxConcurrency int, requestID string) (bool, error) {
|
|
if m.acquireUserSlotFn != nil {
|
|
return m.acquireUserSlotFn(ctx, userID, maxConcurrency, requestID)
|
|
}
|
|
return false, nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) ReleaseUserSlot(ctx context.Context, userID int64, requestID string) error {
|
|
atomic.AddInt32(&m.releaseUserCalled, 1)
|
|
return nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) GetUserConcurrency(ctx context.Context, userID int64) (int, error) {
|
|
return 0, nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) IncrementWaitCount(ctx context.Context, userID int64, maxWait int) (bool, error) {
|
|
return true, nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) DecrementWaitCount(ctx context.Context, userID int64) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) GetAccountsLoadBatch(ctx context.Context, accounts []service.AccountWithConcurrency) (map[int64]*service.AccountLoadInfo, error) {
|
|
return map[int64]*service.AccountLoadInfo{}, nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) GetUsersLoadBatch(ctx context.Context, users []service.UserWithConcurrency) (map[int64]*service.UserLoadInfo, error) {
|
|
return map[int64]*service.UserLoadInfo{}, nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) CleanupExpiredAccountSlots(ctx context.Context, accountID int64) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *concurrencyCacheMock) CleanupStaleProcessSlots(ctx context.Context, activeRequestPrefix string) error {
|
|
return nil
|
|
}
|
|
|
|
func TestConcurrencyHelper_TryAcquireUserSlot(t *testing.T) {
|
|
cache := &concurrencyCacheMock{
|
|
acquireUserSlotFn: func(ctx context.Context, userID int64, maxConcurrency int, requestID string) (bool, error) {
|
|
return true, nil
|
|
},
|
|
}
|
|
helper := NewConcurrencyHelper(service.NewConcurrencyService(cache), SSEPingFormatNone, time.Second)
|
|
|
|
release, acquired, err := helper.TryAcquireUserSlot(context.Background(), 101, 2)
|
|
require.NoError(t, err)
|
|
require.True(t, acquired)
|
|
require.NotNil(t, release)
|
|
|
|
release()
|
|
require.Equal(t, int32(1), atomic.LoadInt32(&cache.releaseUserCalled))
|
|
}
|
|
|
|
func TestConcurrencyHelper_TryAcquireAccountSlot_NotAcquired(t *testing.T) {
|
|
cache := &concurrencyCacheMock{
|
|
acquireAccountSlotFn: func(ctx context.Context, accountID int64, maxConcurrency int, requestID string) (bool, error) {
|
|
return false, nil
|
|
},
|
|
}
|
|
helper := NewConcurrencyHelper(service.NewConcurrencyService(cache), SSEPingFormatNone, time.Second)
|
|
|
|
release, acquired, err := helper.TryAcquireAccountSlot(context.Background(), 201, 1)
|
|
require.NoError(t, err)
|
|
require.False(t, acquired)
|
|
require.Nil(t, release)
|
|
require.Equal(t, int32(0), atomic.LoadInt32(&cache.releaseAccountCalled))
|
|
}
|