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>
158 lines
5.3 KiB
Go
158 lines
5.3 KiB
Go
// Package shared also provides the TOML config loader. Per ADR
|
|
// equivalent of Rust ADR-006 (TOML config over env vars), every
|
|
// service reads `lakehouse.toml` with sane defaults and env
|
|
// overrides. Config is hot-reload-unaware in G0; reload-on-SIGHUP
|
|
// is a G1+ concern.
|
|
package shared
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io/fs"
|
|
"log/slog"
|
|
"os"
|
|
|
|
"github.com/pelletier/go-toml/v2"
|
|
)
|
|
|
|
// Config is the unified Lakehouse config. Each service reads only
|
|
// the section it cares about, but they all share the same file so
|
|
// operators have one place to look.
|
|
type Config struct {
|
|
Gateway GatewayConfig `toml:"gateway"`
|
|
Storaged ServiceConfig `toml:"storaged"`
|
|
Catalogd CatalogConfig `toml:"catalogd"`
|
|
Ingestd IngestConfig `toml:"ingestd"`
|
|
Queryd QuerydConfig `toml:"queryd"`
|
|
S3 S3Config `toml:"s3"`
|
|
Log LogConfig `toml:"log"`
|
|
}
|
|
|
|
// IngestConfig adds ingestd-specific knobs. ingestd needs to PUT
|
|
// parquet to storaged AND register manifests with catalogd, so it
|
|
// holds two upstream URLs in addition to its own bind.
|
|
type IngestConfig struct {
|
|
Bind string `toml:"bind"`
|
|
StoragedURL string `toml:"storaged_url"`
|
|
CatalogdURL string `toml:"catalogd_url"`
|
|
}
|
|
|
|
// GatewayConfig adds the upstream URLs the reverse proxy fronts.
|
|
// Each route family (/v1/storage, /v1/catalog, /v1/ingest, /v1/sql)
|
|
// has its own upstream so we can scale services independently or
|
|
// move them to different boxes without touching gateway code.
|
|
type GatewayConfig struct {
|
|
Bind string `toml:"bind"`
|
|
StoragedURL string `toml:"storaged_url"`
|
|
CatalogdURL string `toml:"catalogd_url"`
|
|
IngestdURL string `toml:"ingestd_url"`
|
|
QuerydURL string `toml:"queryd_url"`
|
|
}
|
|
|
|
// QuerydConfig adds queryd-specific knobs. queryd talks DuckDB
|
|
// directly to MinIO via DuckDB's httpfs extension (so no storaged
|
|
// URL needed), and reads the catalog over HTTP for view registration.
|
|
// SecretsPath defaults to /etc/lakehouse/secrets-go.toml — the same
|
|
// file storaged uses, since both services need the S3 credentials.
|
|
type QuerydConfig struct {
|
|
Bind string `toml:"bind"`
|
|
CatalogdURL string `toml:"catalogd_url"`
|
|
SecretsPath string `toml:"secrets_path"`
|
|
RefreshEvery string `toml:"refresh_every"` // duration string, e.g. "30s"
|
|
}
|
|
|
|
// CatalogConfig adds catalogd-specific knobs on top of the standard
|
|
// bind. StoragedURL points at the storaged service for manifest
|
|
// persistence; G0 defaults to the localhost bind.
|
|
type CatalogConfig struct {
|
|
Bind string `toml:"bind"`
|
|
StoragedURL string `toml:"storaged_url"`
|
|
}
|
|
|
|
// ServiceConfig is the per-binary bind config. Default Bind ""
|
|
// means "use the service's hardcoded G0 default" — see DefaultConfig.
|
|
type ServiceConfig struct {
|
|
Bind string `toml:"bind"`
|
|
}
|
|
|
|
// S3Config holds S3-compatible storage settings. Endpoint blank →
|
|
// AWS default. Bucket "" → "lakehouse-primary".
|
|
type S3Config struct {
|
|
Endpoint string `toml:"endpoint"`
|
|
Region string `toml:"region"`
|
|
Bucket string `toml:"bucket"`
|
|
AccessKeyID string `toml:"access_key_id"`
|
|
SecretAccessKey string `toml:"secret_access_key"`
|
|
UsePathStyle bool `toml:"use_path_style"`
|
|
}
|
|
|
|
// LogConfig — slog level for now; structured fields land G1+.
|
|
type LogConfig struct {
|
|
Level string `toml:"level"`
|
|
}
|
|
|
|
// DefaultConfig returns the G0 dev defaults. Ports are shifted to
|
|
// 3110+ to coexist with the live Rust lakehouse on 3100/3201-3204
|
|
// during the migration. G5 cutover flips gateway back to 3100.
|
|
func DefaultConfig() Config {
|
|
return Config{
|
|
Gateway: GatewayConfig{
|
|
Bind: "127.0.0.1:3110",
|
|
StoragedURL: "http://127.0.0.1:3211",
|
|
CatalogdURL: "http://127.0.0.1:3212",
|
|
IngestdURL: "http://127.0.0.1:3213",
|
|
QuerydURL: "http://127.0.0.1:3214",
|
|
},
|
|
Storaged: ServiceConfig{Bind: "127.0.0.1:3211"},
|
|
Catalogd: CatalogConfig{Bind: "127.0.0.1:3212", StoragedURL: "http://127.0.0.1:3211"},
|
|
Ingestd: IngestConfig{
|
|
Bind: "127.0.0.1:3213",
|
|
StoragedURL: "http://127.0.0.1:3211",
|
|
CatalogdURL: "http://127.0.0.1:3212",
|
|
},
|
|
Queryd: QuerydConfig{
|
|
Bind: "127.0.0.1:3214",
|
|
CatalogdURL: "http://127.0.0.1:3212",
|
|
SecretsPath: "/etc/lakehouse/secrets-go.toml",
|
|
RefreshEvery: "30s",
|
|
},
|
|
S3: S3Config{
|
|
Endpoint: "http://localhost:9000",
|
|
Region: "us-east-1",
|
|
Bucket: "lakehouse-primary",
|
|
UsePathStyle: true,
|
|
},
|
|
Log: LogConfig{Level: "info"},
|
|
}
|
|
}
|
|
|
|
// LoadConfig reads `lakehouse.toml` from path; if path is empty or
|
|
// the file doesn't exist, returns DefaultConfig. Any decode error is
|
|
// fatal (we don't want a misconfigured service silently falling back
|
|
// to defaults — that's the kind of bug you find at 2am).
|
|
//
|
|
// Per Opus + Qwen WARN #3: when path WAS given but the file is
|
|
// missing, log a warning so silent default-fallback doesn't hide
|
|
// misconfiguration. Empty path is fine (caller didn't ask for a
|
|
// file); non-empty + missing is suspicious.
|
|
func LoadConfig(path string) (Config, error) {
|
|
cfg := DefaultConfig()
|
|
if path == "" {
|
|
return cfg, nil
|
|
}
|
|
b, err := os.ReadFile(path)
|
|
if errors.Is(err, fs.ErrNotExist) {
|
|
slog.Warn("config file not found, using defaults",
|
|
"path", path,
|
|
"hint", "create the file or pass -config /path/to/lakehouse.toml")
|
|
return cfg, nil
|
|
}
|
|
if err != nil {
|
|
return cfg, fmt.Errorf("read config: %w", err)
|
|
}
|
|
if err := toml.Unmarshal(b, &cfg); err != nil {
|
|
return cfg, fmt.Errorf("parse config: %w", err)
|
|
}
|
|
return cfg, nil
|
|
}
|