734195e54e
ci/woodpecker/tag/docker Pipeline was successful
## Why
`least_conn` mirror selection (`baseURLAttemptOrder`) scaled super-linearly. After rotating the pool by the round-robin cursor it `sort.SliceStable`d with a comparator that called `inflightCounter` on **every comparison** — and each call did a `remoteName+"\x00"+url` concat plus a `sync.Map` `LoadOrStore` with a speculative `new(atomic.Int64)`. So each selection cost O(n·log n) map lookups + allocations, all on the cache-miss/upstream path.
## How
Snapshot each mirror's in-flight count **once**, then sort the snapshot — O(n) map loads, zero comparator allocations.
- Add read-only `inflightCount(name, url) int64`: plain `sync.Map` `Load`, returns 0 when the gauge is absent (no `LoadOrStore`, no speculative allocation).
- `least_conn` branch builds a `{url, count}` snapshot via one `inflightCount` per rotated URL, `sort.SliceStable` by `count` ascending, then extracts the URLs.
- `beginAttempt`/`endAttempt` keep the create-on-write `inflightCounter` path — they legitimately need to create the gauge.
## Numbers (`BenchmarkBaseURLAttemptOrder_LeastConn`, Ryzen 7 4700U, best of 3)
| pool | before ns/op | after ns/op | before allocs | after allocs | before B/op | after B/op |
|------|-------------:|------------:|--------------:|-------------:|------------:|-----------:|
| 3 | ~2516 | ~1492 | 22 | 8 | 474 | 296 |
| 8 | ~14647 | ~3319 | 131–132 | 8 | 2688 | 568 |
Allocs are now **constant** regardless of pool size; pool-8 is ~4.8x faster with ~16x fewer allocations.
## Behavior
Unchanged: least-loaded first, RR rotation as the stable tie-break, `round_robin` and single-URL paths untouched. Pure internal optimization — no API/schema/DB change. Added a multi-mirror tie-break test asserting all-equal load yields the RR rotation; `make test` (`-race`) green, vet/fmt clean.
Reviewed-on: #124
Co-authored-by: unkin-agent <unkin-agent@unkin.net>
Co-committed-by: unkin-agent <unkin-agent@unkin.net>
149 lines
5.2 KiB
Go
149 lines
5.2 KiB
Go
package proxy
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"git.unkin.net/unkin/artifactapi/pkg/models"
|
|
)
|
|
|
|
// baseURLAttemptOrder and the in-flight gauge only touch the engine's sync.Map
|
|
// fields, so these tests run against a zero-value Engine without a DB/S3/redis
|
|
// stack and can drive the gauge deterministically.
|
|
|
|
// TestLeastConnPicksLeastLoaded pre-loads one mirror's in-flight gauge and
|
|
// asserts a least_conn remote starts its attempt order with the idle mirror.
|
|
func TestLeastConnPicksLeastLoaded(t *testing.T) {
|
|
e := &Engine{}
|
|
r := models.Remote{
|
|
Name: "lc",
|
|
BaseURL: "https://a.example",
|
|
Mirrorlist: []string{"https://b.example"},
|
|
MirrorStrategy: models.MirrorStrategyLeastConn,
|
|
}
|
|
|
|
// Make A appear busy: least_conn must prefer B regardless of RR rotation.
|
|
e.inflightCounter(r.Name, "https://a.example").Add(3)
|
|
for i := 0; i < 5; i++ {
|
|
order := e.baseURLAttemptOrder(r)
|
|
if len(order) != 2 {
|
|
t.Fatalf("attempt %d: order len = %d, want 2", i, len(order))
|
|
}
|
|
if order[0] != "https://b.example" {
|
|
t.Fatalf("attempt %d: least_conn started with %q, want idle mirror https://b.example", i, order[0])
|
|
}
|
|
}
|
|
|
|
// Once B is the busier mirror, the starting pick flips to A.
|
|
e.inflightCounter(r.Name, "https://b.example").Add(10)
|
|
if order := e.baseURLAttemptOrder(r); order[0] != "https://a.example" {
|
|
t.Fatalf("after loading B, least_conn started with %q, want https://a.example", order[0])
|
|
}
|
|
}
|
|
|
|
// TestLeastConnStableTieBreak asserts that when every mirror carries equal
|
|
// in-flight load, least_conn falls back to the round-robin rotation: the
|
|
// snapshot sort is stable, so tied mirrors keep the RR-rotated order and the
|
|
// starting pick advances across the whole pool on successive calls.
|
|
func TestLeastConnStableTieBreak(t *testing.T) {
|
|
e := &Engine{}
|
|
r := models.Remote{
|
|
Name: "lc-tie",
|
|
BaseURL: "https://a.example",
|
|
Mirrorlist: []string{"https://b.example", "https://c.example"},
|
|
MirrorStrategy: models.MirrorStrategyLeastConn,
|
|
}
|
|
pool := r.UpstreamPool()
|
|
|
|
// Equal (zero) load on every mirror: order must equal the RR rotation.
|
|
starts := map[string]int{}
|
|
for i := 0; i < len(pool); i++ {
|
|
order := e.baseURLAttemptOrder(r)
|
|
if len(order) != len(pool) {
|
|
t.Fatalf("attempt %d: order len = %d, want %d", i, len(order), len(pool))
|
|
}
|
|
// A stable sort of an all-tied slice is a pure RR rotation: for the
|
|
// call whose cursor selects start s, order must be pool rotated by s.
|
|
start := indexOf(pool, order[0])
|
|
for j := range order {
|
|
if want := pool[(start+j)%len(pool)]; order[j] != want {
|
|
t.Fatalf("attempt %d: order[%d] = %q, want RR-rotated %q", i, j, order[j], want)
|
|
}
|
|
}
|
|
starts[order[0]]++
|
|
}
|
|
if len(starts) != len(pool) {
|
|
t.Fatalf("tied least_conn did not rotate across the whole pool: %v", starts)
|
|
}
|
|
}
|
|
|
|
func indexOf(s []string, v string) int {
|
|
for i := range s {
|
|
if s[i] == v {
|
|
return i
|
|
}
|
|
}
|
|
return -1
|
|
}
|
|
|
|
// TestRoundRobinDefaultUnchanged asserts an unset strategy still rotates the
|
|
// starting mirror across the pool and ignores the in-flight gauge.
|
|
func TestRoundRobinDefaultUnchanged(t *testing.T) {
|
|
e := &Engine{}
|
|
r := models.Remote{
|
|
Name: "rr",
|
|
BaseURL: "https://a.example",
|
|
Mirrorlist: []string{"https://b.example"},
|
|
}
|
|
|
|
// Even with A heavily loaded, round-robin must still rotate (not avoid A).
|
|
e.inflightCounter(r.Name, "https://a.example").Add(100)
|
|
starts := map[string]int{}
|
|
for i := 0; i < 4; i++ {
|
|
starts[e.baseURLAttemptOrder(r)[0]]++
|
|
}
|
|
if starts["https://a.example"] == 0 || starts["https://b.example"] == 0 {
|
|
t.Fatalf("round-robin did not rotate starting mirror: %v", starts)
|
|
}
|
|
}
|
|
|
|
// TestLeastConnSingleURLNoOp asserts a single-URL pool yields exactly [base_url]
|
|
// and beginAttempt is a no-op there and for round-robin remotes.
|
|
func TestLeastConnSingleURLNoOp(t *testing.T) {
|
|
e := &Engine{}
|
|
solo := models.Remote{Name: "solo", BaseURL: "https://a.example", MirrorStrategy: models.MirrorStrategyLeastConn}
|
|
if order := e.baseURLAttemptOrder(solo); len(order) != 1 || order[0] != "https://a.example" {
|
|
t.Fatalf("single-url order = %v, want [base_url]", order)
|
|
}
|
|
if ctr := e.beginAttempt(solo, "https://a.example"); ctr != nil {
|
|
t.Fatal("beginAttempt on single-url pool should be a no-op (nil)")
|
|
}
|
|
|
|
rr := models.Remote{Name: "rr2", BaseURL: "https://a.example", Mirrorlist: []string{"https://b.example"}}
|
|
if ctr := e.beginAttempt(rr, "https://a.example"); ctr != nil {
|
|
t.Fatal("beginAttempt on round-robin remote should be a no-op (nil)")
|
|
}
|
|
}
|
|
|
|
// TestBeginEndAttemptGauge asserts the gauge increments on begin and returns to
|
|
// zero after endAttempt, so it tracks live in-flight requests.
|
|
func TestBeginEndAttemptGauge(t *testing.T) {
|
|
e := &Engine{}
|
|
r := models.Remote{
|
|
Name: "g",
|
|
BaseURL: "https://a.example",
|
|
Mirrorlist: []string{"https://b.example"},
|
|
MirrorStrategy: models.MirrorStrategyLeastConn,
|
|
}
|
|
c1 := e.beginAttempt(r, "https://a.example")
|
|
c2 := e.beginAttempt(r, "https://a.example")
|
|
if got := e.inflightCounter(r.Name, "https://a.example").Load(); got != 2 {
|
|
t.Fatalf("gauge after two begins = %d, want 2", got)
|
|
}
|
|
endAttempt(c1)
|
|
endAttempt(c2)
|
|
if got := e.inflightCounter(r.Name, "https://a.example").Load(); got != 0 {
|
|
t.Fatalf("gauge after matching ends = %d, want 0", got)
|
|
}
|
|
endAttempt(nil) // tolerated
|
|
}
|