7855d6355c
gates / gates (push) Successful in 21s
MEASURED, NOT GUESSED: GET /configuration -> HTTP 200 in 26.2s. The reasonable guess was that it hashes the artifacts on page load. It does not, and the code already said so: Gitea stores each package file's sha256 and gitea.FileSHA256 reads it as metadata — "a cheap metadata call, the artifact bytes are never downloaded". The cost was never CPU. IT WAS LATENCY x COUNT. artifactChoices made ONE SERIAL round-trip per version, for two packages, capped at 20 each: 2 x (1 version list + 20 sha lookups) = 42 sequential requests at ~0.6s each out through the public ingress. 42 x 0.6 = 26s, which is what the clock said. 1. The sha lookups now run CONCURRENTLY, bounded at 8 in flight. Order preserved by writing into a slot rather than appending — the dropdown is newest-first, and a scrambled sha would show the operator a hash belonging to a DIFFERENT artifact. A failed lookup still drops that version only. 2. The client talks to Gitea IN-CLUSTER (http://gitea.gitea-system.svc.cluster.local:3000, overridable via GITEA_API_URL). Measured from the hub pod: 0.11s against 0.26-1.16s, because the public path adds DNS, the ingress hop and a TLS handshake to each of the 42. Plain HTTP is safe ONLY because it never leaves the cluster network — the registry token rides the Authorization header, so this must not point at a public host without TLS. Unreachable -> the existing graceful degradation to manual text entry, unchanged. DELIBERATELY NOT DONE: caching the sha in the hub's own database. That was the other half of the proposal and it is the wrong shape. Gitea already IS the store; a copy in hub_settings would be a second source of truth that can drift from the registry it describes — and the operator reads exactly this value to confirm what they are about to vouch, so a stale one would be a confident wrong answer. The same reasoning golden_currency_gate.py already records for the vouched version. With the fan-out, a cold load needs no cache to be fast. The cap stays at 20 and now bounds the FAN-OUT too, not just the rendered list. Tests pin order (and that each sha belongs to its own version), per-version failure isolation, and THE CONCURRENCY ITSELF — a wall-clock assertion plus an in-flight counter, so a fast run cannot be luck, and an upper bound so a large package list cannot stampede Gitea. Red-proof: reverting to the serial loop takes 861ms where the concurrent one takes 150ms, and the test fails naming the 26-second page. go build / go vet / go test ./... green (18 packages), run separately from this commit.
195 lines
6.6 KiB
Go
195 lines
6.6 KiB
Go
package web
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"log"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"gitea.dooplex.hu/admin/felhom-hub/internal/gitea"
|
|
)
|
|
|
|
// artifactChoices fans the per-version sha lookups out concurrently (hub v0.100.0). The
|
|
// Configuration page took 26 SECONDS with two dropdowns because it made 42 sequential metadata
|
|
// round-trips. These tests pin the three things that must survive the change: the ORDER, the
|
|
// per-version failure isolation, and the concurrency itself.
|
|
|
|
// fakeGitea serves the two endpoints the client uses, with a controllable per-request delay so
|
|
// "concurrent" is measurable rather than asserted.
|
|
type fakeGitea struct {
|
|
versions []string
|
|
delay time.Duration
|
|
failVer string // this version's /files call 500s
|
|
|
|
inFlight int32
|
|
maxSeen int32
|
|
callCount int32
|
|
}
|
|
|
|
func (f *fakeGitea) start(t *testing.T) *gitea.Client {
|
|
t.Helper()
|
|
mux := http.NewServeMux()
|
|
// BOTH patterns: the version list is GET /api/v1/packages/admin?... with NO trailing slash,
|
|
// the per-version files call is /api/v1/packages/admin/generic/<pkg>/<ver>/files.
|
|
handler := func(w http.ResponseWriter, r *http.Request) {
|
|
n := atomic.AddInt32(&f.inFlight, 1)
|
|
for {
|
|
old := atomic.LoadInt32(&f.maxSeen)
|
|
if n <= old || atomic.CompareAndSwapInt32(&f.maxSeen, old, n) {
|
|
break
|
|
}
|
|
}
|
|
defer atomic.AddInt32(&f.inFlight, -1)
|
|
atomic.AddInt32(&f.callCount, 1)
|
|
time.Sleep(f.delay)
|
|
|
|
// .../generic/<pkg>/<version>/files → the sha metadata
|
|
if len(r.URL.Path) > 6 && r.URL.Path[len(r.URL.Path)-6:] == "/files" {
|
|
for _, v := range f.versions {
|
|
if f.failVer != "" && v == f.failVer && strings.Contains(r.URL.Path, "/"+v+"/") {
|
|
http.Error(w, "boom", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
}
|
|
ver := versionFromFilesPath(r.URL.Path)
|
|
fmt.Fprintf(w, `[{"name":"felhom-agent","sha256":"sha-%s"}]`, ver)
|
|
return
|
|
}
|
|
// the version list
|
|
out := "["
|
|
for i, v := range f.versions {
|
|
if i > 0 {
|
|
out += ","
|
|
}
|
|
out += fmt.Sprintf(`{"name":"felhom-agent","type":"generic","version":%q}`, v)
|
|
}
|
|
fmt.Fprint(w, out+"]")
|
|
}
|
|
mux.HandleFunc("/api/v1/packages/admin", handler)
|
|
mux.HandleFunc("/api/v1/packages/admin/", handler)
|
|
srv := httptest.NewServer(mux)
|
|
t.Cleanup(srv.Close)
|
|
return gitea.New(srv.URL, "admin", "u", "t")
|
|
}
|
|
|
|
func versionFromFilesPath(p string) string {
|
|
// .../generic/<pkg>/<version>/files
|
|
end := len(p) - len("/files")
|
|
start := end - 1
|
|
for start > 0 && p[start-1] != '/' {
|
|
start--
|
|
}
|
|
return p[start:end]
|
|
}
|
|
|
|
func newTestWebServer(t *testing.T, c *gitea.Client) *Server {
|
|
t.Helper()
|
|
s := &Server{logger: log.New(io.Discard, "", 0)}
|
|
s.SetGiteaClient(c)
|
|
return s
|
|
}
|
|
|
|
// The dropdown is newest-first and the concurrent version must not scramble it.
|
|
func TestArtifactChoices_PreservesOrder(t *testing.T) {
|
|
f := &fakeGitea{versions: []string{"0.9.0", "0.8.0", "0.7.0", "0.6.0", "0.5.0"}}
|
|
s := newTestWebServer(t, f.start(t))
|
|
|
|
got := s.artifactChoices(context.Background(), "felhom-agent", "felhom-agent")
|
|
|
|
if len(got) != 5 {
|
|
t.Fatalf("got %d choices, want 5: %+v", len(got), got)
|
|
}
|
|
// ListVersions sorts newest-first; the fan-out must not disturb that, and each sha must belong
|
|
// to ITS OWN version — a slot mix-up would show the operator a hash for a different artifact.
|
|
for i, want := range []string{"0.9.0", "0.8.0", "0.7.0", "0.6.0", "0.5.0"} {
|
|
if got[i].Version != want {
|
|
t.Errorf("choice %d = %q, want %q — the concurrent fan-out scrambled the order", i, got[i].Version, want)
|
|
}
|
|
if got[i].SHA256 != "sha-"+want {
|
|
t.Errorf("version %s carries sha %q — a sha was written into the wrong slot, which would show "+
|
|
"the operator a hash belonging to a different artifact", got[i].Version, got[i].SHA256)
|
|
}
|
|
}
|
|
}
|
|
|
|
// A single failing version drops ITSELF and nothing else — unchanged from the serial version.
|
|
func TestArtifactChoices_OneFailureDropsOnlyThatVersion(t *testing.T) {
|
|
f := &fakeGitea{versions: []string{"0.9.0", "0.8.0", "0.7.0"}, failVer: "0.8.0"}
|
|
s := newTestWebServer(t, f.start(t))
|
|
|
|
got := s.artifactChoices(context.Background(), "felhom-agent", "felhom-agent")
|
|
|
|
if len(got) != 2 {
|
|
t.Fatalf("got %d choices, want 2 (the failing one dropped): %+v", len(got), got)
|
|
}
|
|
for _, c := range got {
|
|
if c.Version == "0.8.0" {
|
|
t.Error("the failing version was included")
|
|
}
|
|
}
|
|
if got[0].Version != "0.9.0" || got[1].Version != "0.7.0" {
|
|
t.Errorf("order broken around the dropped version: %+v", got)
|
|
}
|
|
}
|
|
|
|
// THE POINT OF THE CHANGE. With a per-request delay, a serial implementation takes
|
|
// len(versions) * delay; the concurrent one takes about ceil(n/8) * delay. Asserting the wall-clock
|
|
// is what makes this a test of the fix rather than of the plumbing — and the in-flight counter
|
|
// proves requests genuinely overlapped rather than the timing being luck.
|
|
func TestArtifactChoices_IsConcurrent(t *testing.T) {
|
|
const n = 16
|
|
vers := make([]string, n)
|
|
for i := range vers {
|
|
vers[i] = fmt.Sprintf("0.%d.0", 100-i) // already newest-first
|
|
}
|
|
f := &fakeGitea{versions: vers, delay: 50 * time.Millisecond}
|
|
s := newTestWebServer(t, f.start(t))
|
|
|
|
start := time.Now()
|
|
got := s.artifactChoices(context.Background(), "felhom-agent", "felhom-agent")
|
|
elapsed := time.Since(start)
|
|
|
|
if len(got) != n {
|
|
t.Fatalf("got %d choices, want %d", len(got), n)
|
|
}
|
|
serial := time.Duration(n) * 50 * time.Millisecond // 800ms
|
|
if elapsed > serial/2 {
|
|
t.Errorf("took %v; a serial implementation would take ~%v and the concurrent one should be far "+
|
|
"under half of that. This is the 26-second Configuration page.", elapsed, serial)
|
|
}
|
|
if max := atomic.LoadInt32(&f.maxSeen); max < 2 {
|
|
t.Errorf("max concurrent in-flight requests was %d — the lookups did not actually overlap, so a "+
|
|
"fast wall-clock here would be luck rather than concurrency", max)
|
|
}
|
|
// and it must respect the bound rather than opening one connection per version
|
|
if max := atomic.LoadInt32(&f.maxSeen); max > 8 {
|
|
t.Errorf("max concurrent in-flight was %d, above the bound of 8 — a large package list would "+
|
|
"stampede Gitea", max)
|
|
}
|
|
}
|
|
|
|
// The cap is unchanged: at most 20 versions are offered however many exist.
|
|
func TestArtifactChoices_StillCapsAtTwenty(t *testing.T) {
|
|
vers := make([]string, 30)
|
|
for i := range vers {
|
|
vers[i] = fmt.Sprintf("0.%d.0", 200-i)
|
|
}
|
|
f := &fakeGitea{versions: vers}
|
|
s := newTestWebServer(t, f.start(t))
|
|
|
|
got := s.artifactChoices(context.Background(), "felhom-agent", "felhom-agent")
|
|
if len(got) != 20 {
|
|
t.Errorf("got %d choices, want the 20 cap", len(got))
|
|
}
|
|
if atomic.LoadInt32(&f.callCount) > 21 { // 1 version list + 20 sha lookups
|
|
t.Errorf("made %d requests; the cap must limit the FAN-OUT too, not just the rendered list",
|
|
atomic.LoadInt32(&f.callCount))
|
|
}
|
|
}
|