unkin-agent
68a1f14e17
A remote's base_url may now be a single string OR a list of upstream mirrors. When it is a list the shared proxy engine load-balances across them round-robin and, on an upstream error/timeout/5xx, fails over to the next mirror before returning an error. Because the selection happens in the engine (not per provider), it applies to every remote package type. Backward compatible: a bare-string base_url behaves exactly as before. - add models.StringOrSlice (string-or-array JSON) and custom Remote (Un)MarshalJSON: base_url populates BaseURLs (full list) + BaseURL (active/first); marshals a single mirror back to a bare string - add Remote.BaseURLList / ValidateBaseURLs; validate list is non-empty and every entry is an http/https URL in the v2 create/update handlers - persist the full list in a new base_urls TEXT[] column (additive migration), keeping base_url in sync for old readers; only write base_urls for genuinely multi-mirror remotes - engine: per-remote round-robin cursor + attempt ordering; wrap the fetch/head/revalidate upstream calls in a failover loop that narrows the remote to one selected mirror per attempt; only network errors and 5xx fail over (404/403/... are returned as-is); circuit breaker stays keyed per remote and trips only after all mirrors fail - add unit tests (JSON round-trip, engine round-robin/failover/single-URL, DB multi-URL round-trip) and a docker acceptance suite: round-robin distribution across two mock upstreams, failover past a dead primary, single-base_url regression, and a real dnf makecache+install through a two-mirror rpm remote whose primary is dead Least-connections and a per-remote strategy selector are a follow-up PR.
35 lines
1.3 KiB
YAML
35 lines
1.3 KiB
YAML
# Overlay for the dockerised end-to-end suite (scripts/docker-e2e.sh).
|
|
# Adds a static mock upstream that the artifactapi container proxies, so the
|
|
# caching tests are hermetic and need no internet access.
|
|
services:
|
|
mockupstream:
|
|
image: nginx:alpine
|
|
volumes:
|
|
- ./e2e-docker/fixtures:/usr/share/nginx/html:ro,z
|
|
# No host port needed: only the artifactapi container talks to it, and the
|
|
# tests compare served bytes against the on-disk fixtures.
|
|
|
|
# Two constant-body upstreams for the multi-base_url suite: each returns a
|
|
# distinct, upstream-identifying body for any path, so round-robin
|
|
# distribution across a two-mirror remote is directly observable.
|
|
mockupstreama:
|
|
image: nginx:alpine
|
|
volumes:
|
|
- ./e2e-docker/mirror-conf/a.conf:/etc/nginx/conf.d/default.conf:ro,z
|
|
mockupstreamb:
|
|
image: nginx:alpine
|
|
volumes:
|
|
- ./e2e-docker/mirror-conf/b.conf:/etc/nginx/conf.d/default.conf:ro,z
|
|
|
|
artifactapi:
|
|
# The host port is set via ARTIFACTAPI_PORT (see scripts/docker-e2e.sh),
|
|
# defaulting to 8000; the e2e run uses 8001 to avoid colliding with a
|
|
# locally-running instance.
|
|
depends_on:
|
|
mockupstream:
|
|
condition: service_started
|
|
mockupstreama:
|
|
condition: service_started
|
|
mockupstreamb:
|
|
condition: service_started
|