G0 D6: gateway reverse proxy fronting all 4 backing services · 2 scrum fixes · G0 COMPLETE
Last day of Phase G0. Gateway promotes the D1 stub endpoints into
real reverse-proxies on :3110 fronting storaged + catalogd + ingestd
+ queryd. /v1 prefix lives at the edge — internal services route on
/storage, /catalog, /ingest, /sql, with the prefix stripped by a
custom Director per Kimi K2's D1-plan finding.
Routes:
/v1/storage/* → storaged
/v1/catalog/* → catalogd
/v1/ingest → ingestd
/v1/sql → queryd
Acceptance smoke 6/6 PASS — every assertion goes through :3110, none
direct to backing services. Full ingest → storage → catalog → query
round-trip verified end-to-end. The smoke's "rows[0].name=Alice"
assertion is the architectural payoff: five binaries, six HTTP
routes, one round-trip through one edge.
Cross-lineage scrum on shipped code:
- Opus 4.7 (opencode): 1 BLOCK + 2 WARN + 2 INFO
- Kimi K2-0905 (openrouter): 1 BLOCK + 3 WARN + 1 INFO (3 false positives, all from one wrong TrimPrefix theory)
- Qwen3-coder (openrouter): 5 completion tokens — "No BLOCKs."
Fixed (2, both Opus single-reviewer):
O-BLOCK: Director path stripping fails if upstream URL has a
non-empty path. The default Director's singleJoiningSlash runs
BEFORE the custom code, so an upstream like http://host/api
produces /api/v1/storage/... after the join — then TrimPrefix("/v1")
is a no-op because the string starts with /api. Fix: strip /v1
BEFORE calling origDirector. New TestProxy_SubPathUpstream regression
locks this in. Today: bare-host URLs only, dormant — but moving
gateway behind a sub-path in prod would have silently 404'd.
O-WARN2: url.Parse is permissive — typo "127.0.0.1:3211" (no scheme)
parses fine, produces empty Host, every request 502s. mustParseUpstream
fail-fast at startup with a clear message naming the offending
config field.
Dismissed (3, all Kimi, same false TrimPrefix theory):
K-BLOCK "TrimPrefix loops forever on //v1storage" — false, single
check-and-trim, no loop
K-WARN "no upper bound on repeated // removal" — same false theory
K-WARN "goroutines leak if upstream parse fails while binaries
running" — confused scope; binaries are separate OS processes
launched by the smoke script
D1 smoke updated (post-D6): the 501 stub probes are gone (gateway no
longer stubs /v1/ingest and /v1/sql). Replaced with proxy probes that
verify gateway forwards malformed requests to ingestd and queryd. Launch
order changed from parallel to dep-ordered (storaged → catalogd →
ingestd → queryd → gateway) since catalogd's rehydrate now needs
storaged, queryd's initial Refresh needs catalogd.
All six G0 smokes (D1 through D6) PASS end-to-end after every fix
round. Phase G0 substrate is complete: 5 binaries, 6 routes, 25 fixes
applied across 6 days from cross-lineage review.
G1+ next: gRPC adapters, Lance/HNSW vector indices, Go MCP SDK port,
distillation rebuild, observer + Langfuse integration.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
+28
-24
@@ -20,12 +20,6 @@ go build -o bin/ ./cmd/...
|
||||
PIDS=()
|
||||
trap 'echo "[d1-smoke] cleanup"; kill ${PIDS[@]} 2>/dev/null || true; wait 2>/dev/null || true' EXIT INT TERM
|
||||
|
||||
echo "[d1-smoke] launching..."
|
||||
for SVC in gateway storaged catalogd ingestd queryd; do
|
||||
./bin/$SVC > /tmp/${SVC}.log 2>&1 &
|
||||
PIDS+=($!)
|
||||
done
|
||||
|
||||
# Poll /health on each service until it returns 200 or we hit the
|
||||
# 5s budget. Cheaper than a fixed sleep AND deterministic — first
|
||||
# bind error surfaces immediately, slow boxes wait as long as needed.
|
||||
@@ -42,9 +36,14 @@ poll_health() {
|
||||
return 1
|
||||
}
|
||||
|
||||
echo "[d1-smoke] waiting for /health (poll up to 5s/svc)..."
|
||||
for SPEC in "gateway:3110" "storaged:3211" "catalogd:3212" "ingestd:3213" "queryd:3214"; do
|
||||
# Launch services in dependency order — catalogd's rehydrate needs
|
||||
# storaged up; queryd's initial Refresh needs catalogd up. Gateway is
|
||||
# last so its proxy probes have all upstreams ready.
|
||||
echo "[d1-smoke] launching in dep order..."
|
||||
for SPEC in "storaged:3211" "catalogd:3212" "ingestd:3213" "queryd:3214" "gateway:3110"; do
|
||||
NAME="${SPEC%:*}"; PORT="${SPEC#*:}"
|
||||
./bin/$NAME > /tmp/${NAME}.log 2>&1 &
|
||||
PIDS+=($!)
|
||||
if ! poll_health "$NAME" "$PORT"; then
|
||||
exit 1
|
||||
fi
|
||||
@@ -63,22 +62,27 @@ for SPEC in "gateway:3110" "storaged:3211" "catalogd:3212" "ingestd:3213" "query
|
||||
fi
|
||||
done
|
||||
|
||||
# Single curl with -i grabs both code + headers in one pass, per Opus
|
||||
# WARN #6 — was 2 calls per route, doubling load + creating window.
|
||||
echo "[d1-smoke] gateway 501 stub probes:"
|
||||
for ROUTE in /v1/ingest /v1/sql; do
|
||||
RESP="$(curl -sS -i --max-time 2 -X POST "http://127.0.0.1:3110$ROUTE")"
|
||||
# Per Opus 2nd-pass WARN: head -1 fails on 1xx interim lines.
|
||||
# awk picks the LAST HTTP/* status line — robust to 100 Continue.
|
||||
CODE="$(echo "$RESP" | awk '/^HTTP\//{code=$2} END{print code}')"
|
||||
HDR="$(echo "$RESP" | grep -i 'X-Lakehouse-Stub' || true)"
|
||||
if [ "$CODE" = "501" ] && [ -n "$HDR" ]; then
|
||||
echo " ✓ POST $ROUTE → 501 + $HDR"
|
||||
else
|
||||
echo " ✗ POST $ROUTE → code=$CODE hdr=$HDR"
|
||||
FAILED=1
|
||||
fi
|
||||
done
|
||||
# Post-D6: gateway proxies /v1/ingest → ingestd and /v1/sql → queryd.
|
||||
# We verify the proxy is wired by sending malformed-but-reachable
|
||||
# requests and asserting the BACKING service's 400 (not the gateway's
|
||||
# 502 which would mean the proxy can't reach the upstream).
|
||||
echo "[d1-smoke] gateway proxy probes (D6+):"
|
||||
# /v1/ingest with no `name` query param → ingestd returns 400.
|
||||
HTTP="$(curl -sS -o /dev/null -w '%{http_code}' --max-time 2 -X POST "http://127.0.0.1:3110/v1/ingest")"
|
||||
if [ "$HTTP" = "400" ]; then
|
||||
echo " ✓ POST /v1/ingest (no name) → 400 from ingestd (proxy wired)"
|
||||
else
|
||||
echo " ✗ POST /v1/ingest → $HTTP (want 400; 502 means proxy can't reach ingestd)"
|
||||
FAILED=1
|
||||
fi
|
||||
# /v1/sql with empty body → queryd returns 400.
|
||||
HTTP="$(curl -sS -o /dev/null -w '%{http_code}' --max-time 2 -X POST -H 'Content-Type: application/json' "http://127.0.0.1:3110/v1/sql")"
|
||||
if [ "$HTTP" = "400" ]; then
|
||||
echo " ✓ POST /v1/sql (no body) → 400 from queryd (proxy wired)"
|
||||
else
|
||||
echo " ✗ POST /v1/sql → $HTTP (want 400; 502 means proxy can't reach queryd)"
|
||||
FAILED=1
|
||||
fi
|
||||
|
||||
if [ "$FAILED" -ne 0 ]; then
|
||||
echo "[d1-smoke] FAILED"
|
||||
|
||||
Reference in New Issue
Block a user