i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-02 01:10:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复候选调度中 priority 为 0 时被错误回退为默认值的问题

Browse Source 
使用显式 is not None 判断替代 or 运算符，避免优先级为 0 时被当作 falsy 值处理
This commit is contained in:
fawney19
2026-02-09 12:58:27 +08:00
parent 8684548072
commit 34cdc26e6f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/services/cache/aware_scheduler.py vendored
View File

@@ -1626,10 +1626,12 @@ class CacheAwareScheduler:
result.extend(sorted_group)
else:
# 单个候选或没有 affinity_key，按次要排序条件排序
def secondary_sort(c: ProviderCandidate) -> Any:
def secondary_sort(c: ProviderCandidate) -> tuple[int, int, str]:
pp = c.provider.provider_priority
ip = c.key.internal_priority if c.key else None
return (
c.provider.provider_priority,
c.key.internal_priority if c.key else 999999,
pp if pp is not None else 999999,
ip if ip is not None else 999999,
c.key.id if c.key else "",
)
@@ -1668,9 +1670,11 @@ class CacheAwareScheduler:
else:
# 提供商优先模式：按 (provider_priority, internal_priority) 分组
for candidate in candidates:
pp = candidate.provider.provider_priority
ip = candidate.key.internal_priority if candidate.key else None
key = (
candidate.provider.provider_priority or 999999,
candidate.key.internal_priority if candidate.key else 999999,
pp if pp is not None else 999999,
ip if ip is not None else 999999,
)
priority_groups[key].append(candidate)