fix: prefer available fleet tier before lifeboat
CI / test (push) Successful in 33s
CI / test (pull_request) Successful in 33s

This commit is contained in:
m
2026-08-22 21:35:16 +03:00
parent 2c7a85779b
commit 2f9e9bdc9f
5 changed files with 79 additions and 6 deletions
+22 -2
View File
@@ -37,8 +37,13 @@ func SelectFleetTier(readiness capability.FleetReadiness, preferred capability.F
if readiness.ObservedAtUnixMillis < 1 || len(readiness.Members) == 0 || !validFleetTier(readiness.FallbackTier) {
return "", ErrInvalidFleetReadiness
}
if slices.Contains(readiness.ReadyTiers, preferred) {
return preferred, nil
if !validFleetTier(preferred) {
return "", ErrInvalidFleetReadiness
}
for _, tier := range fleetFailoverOrder(preferred) {
if slices.Contains(readiness.ReadyTiers, tier) {
return tier, nil
}
}
if slices.Contains(readiness.ReadyTiers, readiness.FallbackTier) {
return readiness.FallbackTier, nil
@@ -46,6 +51,21 @@ func SelectFleetTier(readiness capability.FleetReadiness, preferred capability.F
return "", ErrInvalidFleetReadiness
}
func fleetFailoverOrder(preferred capability.FleetTier) []capability.FleetTier {
switch preferred {
case capability.FleetTierHeavy:
return []capability.FleetTier{capability.FleetTierHeavy, capability.FleetTierMedium, capability.FleetTierFast}
case capability.FleetTierMedium:
return []capability.FleetTier{capability.FleetTierMedium, capability.FleetTierFast}
case capability.FleetTierFast:
return []capability.FleetTier{capability.FleetTierFast}
case capability.FleetTierLifeboat:
return []capability.FleetTier{capability.FleetTierLifeboat}
default:
return nil
}
}
func validFleetTier(value capability.FleetTier) bool {
return value == capability.FleetTierFast || value == capability.FleetTierMedium || value == capability.FleetTierHeavy || value == capability.FleetTierLifeboat
}
+30
View File
@@ -16,3 +16,33 @@ func TestFleetReadinessFallsBackToLifeboatWhenPrimaryTiersUnavailable(t *testing
t.Fatalf("selected=%q err=%v", selected, err)
}
}
func TestFleetReadinessFallsBackFromHeavyToMediumBeforeLifeboat(t *testing.T) {
readiness, err := BuildFleetReadiness(100, []capability.FleetMember{
{ProviderInstanceID: "medium", ModelDescriptorID: "qwen-medium", Tier: capability.FleetTierMedium, Ready: true, Reason: "available"},
{ProviderInstanceID: "heavy", ModelDescriptorID: "gpu", Tier: capability.FleetTierHeavy, Ready: false, Reason: "timeout"},
{ProviderInstanceID: "lifeboat", ModelDescriptorID: "qwen-lifeboat", Tier: capability.FleetTierLifeboat, Ready: true, Reason: "available"},
})
if err != nil {
t.Fatal(err)
}
selected, err := SelectFleetTier(readiness, capability.FleetTierHeavy)
if err != nil || selected != capability.FleetTierMedium {
t.Fatalf("selected=%q err=%v", selected, err)
}
}
func TestFleetReadinessFallsBackFromHeavyToFastBeforeLifeboat(t *testing.T) {
readiness, err := BuildFleetReadiness(100, []capability.FleetMember{
{ProviderInstanceID: "fast", ModelDescriptorID: "qwen-fast", Tier: capability.FleetTierFast, Ready: true, Reason: "available"},
{ProviderInstanceID: "heavy", ModelDescriptorID: "gpu", Tier: capability.FleetTierHeavy, Ready: false, Reason: "timeout"},
{ProviderInstanceID: "lifeboat", ModelDescriptorID: "qwen-lifeboat", Tier: capability.FleetTierLifeboat, Ready: true, Reason: "available"},
})
if err != nil {
t.Fatal(err)
}
selected, err := SelectFleetTier(readiness, capability.FleetTierHeavy)
if err != nil || selected != capability.FleetTierFast {
t.Fatalf("selected=%q err=%v", selected, err)
}
}