From 1daa62cf6d4f43e502bf32787c385b4af3f71a91 Mon Sep 17 00:00:00 2001 From: dingo Date: Fri, 9 Oct 2026 08:22:04 -0400 Subject: [PATCH] M10.9: raise the evo-server session cap to 2000 and close 10.9 for now Maintainer decision (2026-10-09): the region session cap becomes a safety bound of 2000 (plus 64 connections of headroom); the load governor is the working limit. Library bounds go from 1024 to 4096 in SessionControl, IntentAdmission and ReplicationServer (defaults stay 32). Drills stop for now: saturation and native-client observation move to a later 2k drill, whose prerequisites ADR-0097 lists (single-thread CPU, region login rate, 256 MiB pod limit, linear lookups). Declared: >= 32 sessions within every budget on the reference worker. Budgets v2, STATUS, ROADMAP, VALIDATION. Refresh the dev session window. Co-Authored-By: Claude Opus 5.5 --- apps/evo-server/m10_bridge.hpp | 8 +++++ .../region/dev-session-route/listener.yaml | 2 +- docs/ROADMAP.md | 3 +- docs/STATUS.md | 7 ++++- .../0097-m10-load-and-abuse-qualification.md | 29 +++++++++++++++++++ docs/engineering/VALIDATION.md | 21 ++++++++++++++ include/evo/network/session_control.hpp | 2 +- schemas/network/m10-budgets-v2.md | 2 +- src/network/protocol/intent_admission.cpp | 2 +- src/network/protocol/replication.cpp | 2 +- src/network/protocol/session_control.cpp | 2 +- tests/network_control.cpp | 13 +++++++++ tests/network_replication.cpp | 6 ++++ 13 files changed, 91 insertions(+), 8 deletions(-) diff --git a/apps/evo-server/m10_bridge.hpp b/apps/evo-server/m10_bridge.hpp index 665f5fc..4aec485 100644 --- a/apps/evo-server/m10_bridge.hpp +++ b/apps/evo-server/m10_bridge.hpp @@ -75,6 +75,9 @@ struct M10Options { }; // Actions are handed to the host as soon as they are scheduled (at most 8 ticks ahead). inline constexpr std::uint64_t m10_carry_ahead_ticks = 8; +// Sessions per region (budgets v2, ADR-0097): a safety bound; the load governor is the +// working limit. +inline constexpr std::size_t m10_max_sessions = 2000; #ifdef EVO_SERVER_M10 inline constexpr bool m10_available = true; @@ -108,6 +111,11 @@ template class M10Bridge { // an advancing one goes out at most every 4 ticks (cumulative, nothing is lost). config.intents.watermark_every = 4; config.intents.watermark_coalesce = 4; + // ADR-0097 (maintainer, 2026-10-09): the session cap is a safety bound, not the + // working limit; the load governor refuses logins long before it. Connections beyond + // it are headroom for logins and closes still flushing. + config.control.max_sessions = m10_max_sessions; + config.transport.limits.max_connections = m10_max_sessions + 64; config.transport.listen_address = o.listen.substr(0, colon); config.transport.port = port; config.transport.certificate_pem_file = o.certificate; diff --git a/deploy/kubernetes/region/dev-session-route/listener.yaml b/deploy/kubernetes/region/dev-session-route/listener.yaml index 7089f5b..4751154 100644 --- a/deploy/kubernetes/region/dev-session-route/listener.yaml +++ b/deploy/kubernetes/region/dev-session-route/listener.yaml @@ -12,7 +12,7 @@ spec: env: - {name: REGION_SESSION, value: "dev"} - {name: REGION_SESSION_LISTEN, value: "0.0.0.0:7400"} - - {name: REGION_SESSION_WINDOW, value: "dev-20261009T113452-96b1:1791559492"} + - {name: REGION_SESSION_WINDOW, value: "dev-20261009T121534-57f7:1791561934"} - {name: REGION_M10_MAX_GRANT_LIFETIME, value: "14400"} ports: # QUIC (ADR-0090): UDP only; nothing listens on TCP 7400. diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md index 8a03554..704ba9b 100644 --- a/docs/ROADMAP.md +++ b/docs/ROADMAP.md @@ -551,7 +551,8 @@ drain lease loss with 24 bots (all back within 5 s of the successor) done; no st raw-UDP sender (abuse stays in-process/loopback; datagram-cap eviction cost analysed). 10.9d drill harness (load-drill.sh, server load-report, bundle-mode evo-load, Mbed TLS crypto lock) done; reference runs 3-5 done (budgets v2, watermark coalescing, batched durable -lookups; within budget to the 32-session cap); saturation and native-client observation open. +lookups; within budget to the 32-session cap). Session cap raised to 2000 (maintainer, 2026-10-09); 10.9 +closed for now, with saturation and native-client observation deferred to a later 2k drill (ADR-0097). **Entry:** M9 client/session evidence and M7/M8 dev/stage durability. Read NETWORK_ARCHITECTURE, PERSISTENCE_ARCHITECTURE and ADR-0017. The M9 transport is diff --git a/docs/STATUS.md b/docs/STATUS.md index 979a066..3adaada 100644 --- a/docs/STATUS.md +++ b/docs/STATUS.md @@ -141,7 +141,12 @@ Reference runs on evolution-dev: reached the configured 32-session cap without saturating. At 20, the login ramp drew 4 refusals and per-session p99 was 0.554 ms (budget 0.5). -Open before 10.9 completes: saturation beyond the cap, and native-client observation. +The maintainer closed 10.9 for now (2026-10-09): +- evo-server's session cap is raised to 2000, with the load governor as the working limit; +- drills stop for now. Saturation and native-client observation move to a later 2k drill. + ADR-0097 lists what that drill must solve first: single-thread CPU (the governor would + cap near 50–70 sessions), the region login rate (64 per 60 s), the 256 MiB pod limit and + linear session lookups. ## Previous gate - 2026-10-02 diff --git a/docs/adr/0097-m10-load-and-abuse-qualification.md b/docs/adr/0097-m10-load-and-abuse-qualification.md index b5c9747..69b5441 100644 --- a/docs/adr/0097-m10-load-and-abuse-qualification.md +++ b/docs/adr/0097-m10-load-and-abuse-qualification.md @@ -460,3 +460,32 @@ Open for 10.9's completion criteria, a maintainer decision: Follow-ups: - login and close store work off the simulation thread, or batched; - the commit off the tick (already recorded). + +**Maintainer decisions (2026-10-09), closing 10.9 for now:** +1. **Session cap raised to 2000** in evo-server (`m10_max_sessions`, plus 64 connections of + headroom). The library bounds go from 1024 to 4096 (`SessionControl`, + `IntentAdmission`, `ReplicationServer`); the library defaults stay 32. The cap is + now a safety bound, and the load governor (refuse, then shed) is the working limit. +2. **No more drills for now.** Saturation and native-client observation move to a later + 2k drill. The maintainer will watch that drill with the native client. + +Declared, on the evolution-dev reference worker: +- **Sustainable:** at least 32 sessions within every budget (fifth run). That is a + measured lower bound, not a saturation point. +- **Overload response:** measured as designed. The governor refused logins during a ramp + burst and shed during a mass close, and no tick debt built up. + +What the 2k drill has to face (estimates, not measurements): +- **Per-tick CPU.** The session layer costs 0.35–0.55 ms per session per tick on one + thread against a 25 ms p95 budget. The governor would refuse somewhere around 50–70 + sessions, well short of 2000. 2000 sessions in one region need a different architecture + (session work off the simulation thread, several regions per world, or both). That + calls for its own ADR before the drill. +- **Login rate.** `ControlConfig::max_region_attempts` is 64 per 60 s region-wide, so a + 2000-session ramp would take about 31 minutes. Whether to raise it is an abuse-budget + decision for that drill. +- **Memory.** The evo-region pod is limited to 256 MiB, and the governor bounds CPU, not + memory. Each session's baselines, msquic state and per-session queues need measuring + before thousands of sessions are admitted. +- **Linear scans.** Sessions and actions are found by linear search; that is fine at tens + of sessions, not at thousands. diff --git a/docs/engineering/VALIDATION.md b/docs/engineering/VALIDATION.md index cba7b20..be3fdc5 100644 --- a/docs/engineering/VALIDATION.md +++ b/docs/engineering/VALIDATION.md @@ -5291,3 +5291,24 @@ Image `c597c0ba…`, 11:28–11:33 UTC, restored Ready. Steps 20/24/28/32, 60 s Not done: - saturation beyond the 32-session cap; - native-client observation during a drill. + +## 2026-10-09 — M10.9 session cap 2000 (maintainer decision) + +evo-server's session cap is 2000 (plus 64 connections of headroom). The library bounds +are 4096 in `SessionControl`, `IntentAdmission` and `ReplicationServer`. New tests check +that each accepts 2000 and refuses 4097. No drill was run, by decision: saturation and +native-client observation are deferred to a later 2k drill. Its prerequisites are in +ADR-0097. + +Executed: +- WSL Release `quic`: the network test passed (after a test fix: the helper config's + `max_accounts` of 8 was below the 2000 cap), and quic/ops-contracts/session-fuzz + passed. +- The 18 Postgres suites passed; every evo-server process starts with the 2000 cap, and + the `evo-load` smoke passed. +- clang-tidy 19, clean. +- Windows `debug` 60/60 and `quic` 5/5. + +Not run: Windows `client-network`. The maintainer's `evo-client.exe` was running from +that build directory, so the link could not replace it (LNK1104). The change touches no +client code. diff --git a/include/evo/network/session_control.hpp b/include/evo/network/session_control.hpp index 1866a3a..b126df6 100644 --- a/include/evo/network/session_control.hpp +++ b/include/evo/network/session_control.hpp @@ -60,7 +60,7 @@ struct ControlConfig { DeploymentEnvironment environment{DeploymentEnvironment::dev}; world::WorldIdentity world; std::uint64_t region{}, epoch{}; - std::size_t max_sessions{32}; + std::size_t max_sessions{32}; // At most 4096 (ADR-0097: evo-server uses 2000). std::size_t max_accounts{4096}; // Tracked accounts (sessions, serials, rates). std::uint64_t max_grant_lifetime{300}; // Seconds; grants are short-lived. std::uint64_t clock_skew{30}; // Seconds tolerated before issued_at. diff --git a/schemas/network/m10-budgets-v2.md b/schemas/network/m10-budgets-v2.md index 4828a48..1f0d815 100644 --- a/schemas/network/m10-budgets-v2.md +++ b/schemas/network/m10-budgets-v2.md @@ -40,7 +40,7 @@ in real time; changing it requires a versioned rules migration (ADR-0089). | Replication per session | <= 16 KiB per tick | budget | 10.5 | | Client event queue | 1,024 events | budget | client session | | Heartbeat / liveness / handshake | 1 s / 5 s / 5 s | budget | 10.2, 10.7 | -| Sessions per region | >= 20 required, 32 default | budget | 10.9 | +| Sessions per region | >= 20 required; cap 2000 in evo-server (maintainer, 2026-10-09; library bound 4096). The load governor is the working limit: within every budget to 32 on the reference worker (fifth run); saturation is unmeasured (2k drill pending) | budget | 10.9 | | Per-tick region work | p95 <= 25 ms over all ticks on the reference worker; ticks that commit a batch <= 50 ms (measured separately) | budget (v2) | 10.9 (`m10 load-report` commit_max_us / other_max_us, `evo_m10_tick_work_*`, ADR-0097) | | Session handling | <= 0.5 ms per session per tick | budget | 10.9 (measured: `evo_m10_session_work_*`, ADR-0097) | | Host input queue | 64 inputs, 64 KiB | budget | region host | diff --git a/src/network/protocol/intent_admission.cpp b/src/network/protocol/intent_admission.cpp index f154726..ebbc636 100644 --- a/src/network/protocol/intent_admission.cpp +++ b/src/network/protocol/intent_admission.cpp @@ -17,7 +17,7 @@ std::expected IntentAdmission::create(Intent if (limits.intent_window == 0 || limits.intent_window > 64 || limits.window_ticks == 0 || limits.max_intents_per_window == 0 || limits.max_actions_per_window == 0 || limits.max_unresolved == 0 || limits.max_unresolved > 4096 || limits.max_sessions == 0 || - limits.max_sessions > 1024 || limits.max_finals == 0 || limits.watermark_every == 0 || + limits.max_sessions > 4096 || limits.max_finals == 0 || limits.watermark_every == 0 || limits.watermark_coalesce == 0) return std::unexpected(IntentConfigError::invalid); IntentAdmission admission{limits}; diff --git a/src/network/protocol/replication.cpp b/src/network/protocol/replication.cpp index ab1db3a..361d6f1 100644 --- a/src/network/protocol/replication.cpp +++ b/src/network/protocol/replication.cpp @@ -167,7 +167,7 @@ std::expected ReplicationServer::create(Rep l.far_interval == 0 || l.max_baselines == 0 || l.max_baselines > 16 || l.max_baseline_age == 0 || l.tick_budget_bytes < session_datagram_bytes || l.tick_budget_bytes > std::size_t{max_chunks} * session_datagram_bytes || - l.max_sessions == 0 || l.max_sessions > 1024) + l.max_sessions == 0 || l.max_sessions > 4096) return std::unexpected(ReplicationError::invalid_config); return ReplicationServer{l}; } diff --git a/src/network/protocol/session_control.cpp b/src/network/protocol/session_control.cpp index 55effa8..40a3e5f 100644 --- a/src/network/protocol/session_control.cpp +++ b/src/network/protocol/session_control.cpp @@ -26,7 +26,7 @@ std::string log_label(const AccountId& account) { std::expected SessionControl::create(ControlConfig config) { if (config.world.world == 0 || config.world.frame == 0 || config.region == 0 || - config.epoch == 0 || config.max_sessions == 0 || config.max_sessions > 1024 || + config.epoch == 0 || config.max_sessions == 0 || config.max_sessions > 4096 || config.max_accounts < config.max_sessions || config.max_accounts > (std::size_t{1} << 20) || config.max_grant_lifetime == 0 || config.max_grant_lifetime > 14400 || config.clock_skew > 300 || config.max_account_attempts == 0 || diff --git a/tests/network_control.cpp b/tests/network_control.cpp index f5d3130..0580a0a 100644 --- a/tests/network_control.cpp +++ b/tests/network_control.cpp @@ -213,6 +213,12 @@ void control_rules() { CHECK(SessionControl::create(bad)); bad.max_grant_lifetime = 14401; CHECK(refused(SessionControl::create(bad), ControlError::invalid_config)); + bad = config(); // ADR-0097: evo-server's 2000-session cap fits; the bound is 4096. + bad.max_sessions = 2000; + bad.max_accounts = 8192; + CHECK(SessionControl::create(bad)); + bad.max_sessions = 4097; // Refused by the session bound alone. + CHECK(refused(SessionControl::create(bad), ControlError::invalid_config)); } // Scope and time. { @@ -575,6 +581,13 @@ void intent_admission() { limits.max_unresolved = 6; limits.max_finals = 4; CHECK(refused(IntentAdmission::create(IntentLimits{0}), IntentConfigError::invalid)); + { + IntentLimits wide; + wide.max_sessions = 2000; + CHECK(IntentAdmission::create(wide)); + wide.max_sessions = 4097; + CHECK(refused(IntentAdmission::create(wide), IntentConfigError::invalid)); + } auto a = *IntentAdmission::create(limits); const auto alice = account(1), bob = account(2); CHECK(a.open(1, alice) && a.open(2, bob) && !a.open(1, alice) && !a.open(0, alice)); diff --git a/tests/network_replication.cpp b/tests/network_replication.cpp index b24efcd..0b9e3ec 100644 --- a/tests/network_replication.cpp +++ b/tests/network_replication.cpp @@ -148,6 +148,12 @@ void codec_v2() { } void convergence_and_deltas() { + // ADR-0097: evo-server's 2000-session cap fits; the bound is 4096. + auto wide = limits(); + wide.max_sessions = 2000; + CHECK(ReplicationServer::create(wide)); + wide.max_sessions = 4097; + CHECK(refused(ReplicationServer::create(wide), ReplicationError::invalid_config)); auto server = *ReplicationServer::create(limits()); World world; CHECK(server.open(1, 5));