From 1675bb688d3695598e8d994d7fc4ac760482aefe Mon Sep 17 00:00:00 2001 From: dingo Date: Wed, 14 Oct 2026 12:14:45 -0400 Subject: [PATCH] Let cellular sessions use the DEV grant ceiling The cellular profile refused --m10-max-grant-lifetime and the Deployment never passed it, so playtest grants were capped at the 300 s default. The cellular bridge now applies the DEV-only ceiling like lineage, and the Deployment passes the overlay's ceiling (4 h in DEV) to both profiles. Recorded in ADR-0123. Co-Authored-By: Claude Opus 5.5 --- apps/evo-server/cellular_bridge.hpp | 7 +++++++ apps/evo-server/main.cpp | 4 ++-- deploy/kubernetes/region/base/deployment.yaml | 8 ++++---- deploy/kubernetes/region/dev-session-route/listener.yaml | 2 +- ...dev-cellular-region-and-life-allocator-provisioning.md | 8 ++++++++ 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/apps/evo-server/cellular_bridge.hpp b/apps/evo-server/cellular_bridge.hpp index d3f1ea6..7514c4d 100644 --- a/apps/evo-server/cellular_bridge.hpp +++ b/apps/evo-server/cellular_bridge.hpp @@ -64,6 +64,13 @@ class CellularBridge { config.control.epoch = 1; config.control.max_sessions = 512; config.transport.limits.max_connections = 576; + if (options.max_grant_lifetime != 0) { + // As for lineage (M10.5c): a longer DEV ceiling lets a playtest outlive the 300 s + // default; never outside dev. + if (config.control.environment != network::DeploymentEnvironment::dev) + return fail("error m10-grant-lifetime"); + config.control.max_grant_lifetime = options.max_grant_lifetime; + } const auto life_routes = parse_life_owner_routes(options); if (!life_routes || life_routes->empty()) return fail("error cellular-life-routes"); diff --git a/apps/evo-server/main.cpp b/apps/evo-server/main.cpp index 8569ec1..2523d56 100644 --- a/apps/evo-server/main.cpp +++ b/apps/evo-server/main.cpp @@ -328,8 +328,8 @@ std::optional parse(int argc, char** argv) { if (o.profile == "cellular" && (!server_app::m10_available || !o.m10.complete() || o.primitive_session.any() || o.synthetic || !o.crash_point.empty() || o.session.any() || !o.m10.area.empty() || - !o.m10.handoff_key.empty() || !o.m10.neighbours.empty() || o.m10.max_grant_lifetime != 0 || - !o.m10.load_governor || o.host.flush_interval != 1000ms || o.drain != 10000ms)) + !o.m10.handoff_key.empty() || !o.m10.neighbours.empty() || !o.m10.load_governor || + o.host.flush_interval != 1000ms || o.drain != 10000ms)) return std::nullopt; if (std::ranges::find(o.host.retained_builds, o.host.build) == o.host.retained_builds.end()) o.host.retained_builds.push_back(o.host.build); diff --git a/deploy/kubernetes/region/base/deployment.yaml b/deploy/kubernetes/region/base/deployment.yaml index 0e61a15..10a854f 100644 --- a/deploy/kubernetes/region/base/deployment.yaml +++ b/deploy/kubernetes/region/base/deployment.yaml @@ -66,12 +66,12 @@ spec: --m10-environment "$REGION_SESSION" --session-window "$REGION_SESSION_WINDOW") grant=(--m10-max-grant-lifetime "$REGION_M10_MAX_GRANT_LIFETIME") fi - # Lineage keeps its 20 s drain and overlay grant ceiling. The cellular - # profile (M11.3) fixes its own 10 s drain and 300 s grant ceiling and - # needs the world's --life-route catalog, one entry per region. + # Lineage keeps its 20 s drain. Both profiles take the overlay grant ceiling; + # the cellular profile (M11.3) fixes its own 10 s drain and needs the + # world's --life-route catalog, one entry per region. profile=(--profile lineage "${grant[@]}" --drain-ms 20000) if [ "$REGION_PROFILE" = cellular ]; then - profile=(--profile cellular) + profile=(--profile cellular "${grant[@]}") for route in $REGION_LIFE_ROUTES; do profile+=(--life-route "$route"); done fi exec /usr/local/bin/evo-server "${profile[@]}" "${retained[@]}" "${inputs[@]}" \ diff --git a/deploy/kubernetes/region/dev-session-route/listener.yaml b/deploy/kubernetes/region/dev-session-route/listener.yaml index 1222b7d..9513048 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-20261014T134541-22680:1791996341"} + - {name: REGION_SESSION_WINDOW, value: "dev-20261014T161445-31126:1792005285"} - {name: REGION_M10_MAX_GRANT_LIFETIME, value: "14400"} ports: # QUIC (ADR-0090): UDP only; nothing listens on TCP 7400. diff --git a/docs/adr/0123-dev-cellular-region-and-life-allocator-provisioning.md b/docs/adr/0123-dev-cellular-region-and-life-allocator-provisioning.md index 09a6beb..1cca35b 100644 --- a/docs/adr/0123-dev-cellular-region-and-life-allocator-provisioning.md +++ b/docs/adr/0123-dev-cellular-region-and-life-allocator-provisioning.md @@ -131,3 +131,11 @@ Regions 1, 2 and 3 stay in the stores untouched and unserved; rules 1-4 regions cannot be migrated to rules 5. An account whose life is still active in region 3 (no ending was recorded there, since region 3 ran a pre-v37 image) is routed to region 3, which is no longer served, so playtests use fresh accounts. + +## Later DEV change (2026-10-14): cellular grant ceiling + +At the maintainer's request for playtests longer than five minutes, the cellular +profile now honours `--m10-max-grant-lifetime` (DEV only, 60-14400 s), and the +region Deployment passes the overlay ceiling to both profiles. DEV's route overlay +already sets 14400 s (4 h), so cellular grants may now last up to 4 hours. The +300 s default still applies wherever no ceiling is configured.