fix: Pick 限最高优先级层加权随机,接入绑定级权重,修 loadBound 顺序丢失

- Pick 只在最高 priority 层内加权随机:低优先级渠道此前可能在首选
  渠道健康时被随机打中,priority 只体现在故障转移顺序上
- 均衡权重 = 绑定级 Weight × 渠道级 Weight:绑定表 weight 字段此前
  存而不用;乘法合成使默认绑定权重 1 时等价纯渠道权重
- loadBound 原按绑定记录返回顺序输出候选,丢掉了 SQL 的 priority
  ASC 排序,绑定渠道的故障转移顺序实际是随机的
- 新增两个测试锁定优先级层与权重语义
This commit is contained in:
Sakurasan committed 2026-10-30 01:21:41 +08:00
1 parent 57134d2af2
commit 6cb840718f
2 files changed
+90 -20

No files matched your search

+41 -20
View File
@@ -55,6 +55,7 @@ func NewService(db *gorm.DB, enc *crypto.Encryptor) *Service {
type Candidate struct { type Candidate struct {
Channel *store.Channel Channel *store.Channel
UpstreamModel string // 全局模型在此渠道的映射名(无绑定则为空,用客户端模型名) UpstreamModel string // 全局模型在此渠道的映射名(无绑定则为空,用客户端模型名)
Weight int // 绑定级权重(默认 1;均衡权重 = 绑定级 × 渠道级)
} }
// Candidates 返回可用渠道候选:健康 + 启用 + 不在运行期冷却,按优先级、权重降序、id 升序排列。 // Candidates 返回可用渠道候选:健康 + 启用 + 不在运行期冷却,按优先级、权重降序、id 升序排列。
@@ -103,15 +104,18 @@ func (s *Service) loadBound(bindings []store.ChannelModelBinding) []Candidate {
var chs []store.Channel var chs []store.Channel
s.db.Where("id IN ? AND enabled = ? AND health_status = ?", ids, true, store.ChannelHealthHealthy). s.db.Where("id IN ? AND enabled = ? AND health_status = ?", ids, true, store.ChannelHealthHealthy).
Order("priority ASC, weight DESC, id ASC").Find(&chs) Order("priority ASC, weight DESC, id ASC").Find(&chs)
byID := map[uint64]*store.Channel{} out := make([]Candidate, 0, len(chs))
// 按查询排好序的 chs 输出(而不是绑定返回顺序),保证候选保持 priority ASC 的故障转移顺序
for i := range chs { for i := range chs {
byID[chs[i].ID] = &chs[i] ch := &chs[i]
} if s.InCooldown(ch.ID) {
out := make([]Candidate, 0, len(ids)) continue
for _, id := range ids {
if ch, ok := byID[id]; ok && !s.InCooldown(id) {
out = append(out, Candidate{Channel: ch, UpstreamModel: byChannel[id].UpstreamModel})
} }
out = append(out, Candidate{
Channel: ch,
UpstreamModel: byChannel[ch.ID].UpstreamModel,
Weight: byChannel[ch.ID].Weight,
})
} }
return out return out
} }
@@ -131,31 +135,48 @@ func (s *Service) AvailableModelIDs() []uint64 {
} }
// Pick 按权重加权随机选一个候选渠道(负载均衡)。 // Pick 按权重加权随机选一个候选渠道(负载均衡)。
// 只在最高优先级层(priority 最小,候选已按 priority ASC 排序)内随机——
// 低优先级候选不参与首个请求的分配,仅作为故障转移备选。
// 权重 = 绑定级 Weight × 渠道级 Weight(见 pickWeight)。
func (s *Service) Pick(cands []Candidate) *store.Channel { func (s *Service) Pick(cands []Candidate) *store.Channel {
if len(cands) == 0 { if len(cands) == 0 {
return nil return nil
} }
total := 0 top := cands[0].Channel.Priority
for _, c := range cands { pool := cands
w := c.Channel.Weight for i, c := range cands {
if w <= 0 { if c.Channel.Priority != top {
w = 1 pool = cands[:i]
break
} }
total += w }
total := 0
for _, c := range pool {
total += pickWeight(c)
} }
n, _ := rand.Int(rand.Reader, big.NewInt(int64(total))) n, _ := rand.Int(rand.Reader, big.NewInt(int64(total)))
acc := 0 acc := 0
for _, c := range cands { for _, c := range pool {
w := c.Channel.Weight acc += pickWeight(c)
if w <= 0 {
w = 1
}
acc += w
if int(n.Int64()) < acc { if int(n.Int64()) < acc {
return c.Channel return c.Channel
} }
} }
return cands[len(cands)-1].Channel return pool[len(pool)-1].Channel
}
// pickWeight 候选的均衡权重 = 绑定级权重 × 渠道级权重(各 ≤0 按 1)。
// 绑定级默认 1,未显式配置时等价于纯渠道权重;绑定上显式加权可对该模型单独放大。
func pickWeight(c Candidate) int {
bw := c.Weight
if bw <= 0 {
bw = 1
}
cw := c.Channel.Weight
if cw <= 0 {
cw = 1
}
return bw * cw
} }
// TryAcquire 尝试获取渠道并发槽;渠道满载返回 false(调用方可溢出到其他渠道)。 // TryAcquire 尝试获取渠道并发槽;渠道满载返回 false(调用方可溢出到其他渠道)。
+49
View File
@@ -277,3 +277,52 @@ func TestReportFailureCooldownOverrideAndClamp(t *testing.T) {
t.Fatalf("短 Retry-After 不应缩短默认冷却,实际 %s", rem) t.Fatalf("短 Retry-After 不应缩短默认冷却,实际 %s", rem)
} }
} }
// Pick 只在最高优先级层内加权随机;低优先级渠道即使权重再大也不该被首选打中。
func TestPickStaysInTopPriorityTier(t *testing.T) {
db := newTestDB(t)
seedChannel(t, db, "low-pri", 100000, 5, 4) // 低优先级 + 巨大权重
seedChannel(t, db, "top-pri", 1, 0, 4)
s := NewService(db, crypto.NewEncryptor("test-master-key-1234567890"))
cands := s.Candidates("")
if len(cands) != 2 {
t.Fatalf("candidates = %d, want 2", len(cands))
}
for i := 0; i < 50; i++ {
ch := s.Pick(cands)
if ch.Name != "top-pri" {
t.Fatalf("pick %d: 应始终选最高优先级渠道,实际 %s", i, ch.Name)
}
}
}
// 绑定级权重与渠道级权重相乘:默认绑定权重 1 时等价纯渠道权重,显式加权可单独放大。
func TestPickBindingWeightMultiplier(t *testing.T) {
db := newTestDB(t)
seedChannel(t, db, "plain", 1, 0, 4)
seedChannel(t, db, "boosted", 1, 0, 4)
var m store.Model
m = store.Model{Name: "mm", Enabled: true}
db.Create(&m)
var chs []store.Channel
db.Order("id").Find(&chs)
db.Create(&store.ChannelModelBinding{ChannelID: chs[0].ID, ModelID: m.ID, UpstreamModel: "mm"}) // 默认 weight=1
db.Create(&store.ChannelModelBinding{ChannelID: chs[1].ID, ModelID: m.ID, UpstreamModel: "mm", Weight: 100}) // 显式放大
s := NewService(db, crypto.NewEncryptor("test-master-key-1234567890"))
cands := s.Candidates("mm")
if len(cands) != 2 {
t.Fatalf("candidates = %d, want 2", len(cands))
}
boosted := 0
for i := 0; i < 200; i++ {
if ch := s.Pick(cands); ch.Name == "boosted" {
boosted++
}
}
if boosted < 150 || boosted > 200 {
t.Fatalf("权重 100:1 下 boosted 命中 %d/200,应接近 200", boosted)
}
}