diff --git a/deploy/kubernetes/region/dev-session-route/listener.yaml b/deploy/kubernetes/region/dev-session-route/listener.yaml index f746f56..13a8251 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-20261013T202231-51334:1791933751"} + - {name: REGION_SESSION_WINDOW, value: "dev-20261013T205109-48305:1791935469"} - {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 0655dd2..55973d9 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 @@ -96,6 +96,15 @@ region in DEV. Bringing one up exposed four gaps: - Other births stay queued until the account returns. - Restarting the pod cleared the in-memory queue. The reservation is durable, and the client's query re-queues it. +- **A refused life request no longer breaks the session.** The cellular host + reports the reserved identity on a pending or refused request. + `RegionSessions` forwarded it unchanged, and the codec rejects any identity + or commit on a non-born outcome. The client closed with `protocol` and + retried with the next grant until the account was rate-limited. The client + picks a new birth request per launch, so every account that already had a + cell was refused as `existing_life` and could not log in from a fresh + launch. The session layer now sends the identity and commit only with + `born`. - **Grants for region 3 must be minted with `--region 3 --lifetime 300` or less.** Longer probe sessions require a separate, reviewed change to the cellular grant ceiling; this ADR does not make it. diff --git a/docs/engineering/VALIDATION.md b/docs/engineering/VALIDATION.md index 627ba05..bd3b3eb 100644 --- a/docs/engineering/VALIDATION.md +++ b/docs/engineering/VALIDATION.md @@ -7194,4 +7194,16 @@ failed again every 20 s, refusing logins with `shutdown`. A restart of `Deployment/evo-region` (permitted by the agent contract) cleared the in-memory queue, and the region held `ready 1` at epoch 8 from 20:20:44 UTC. `serve_cellular` now includes, and ticks for, only births whose account holds -a session. Checked locally: g++-14 `-Werror`, clang-tidy-19 and clang-format. \ No newline at end of file +a session. Checked locally: g++-14 `-Werror`, clang-tidy-19 and clang-format. +Logins from a fresh client launch then failed in a loop: welcome, then the +client closed with `protocol`. A diagnostic in `RegionSessionClient` (now +kept: protocol closes name their cause on stderr) showed +`message decode detail=6 bytes=33`, a primitive-life outcome the codec +rejects. A new client launch sends a new birth request; for an account that +already has a cell, the cellular host reports `existing_life` with the +reserved identity, and `RegionSessions` forwarded it although the codec allows +an identity only with `born`. The session layer now clears identity and commit +on every other result. `quic_sessions` adds an `existing_life` refusal that +must arrive valid while the session stays established. Locally (MSVC, client +preset) the case failed with the same 33-byte decode error before the fix and +passed after it. \ No newline at end of file diff --git a/src/client/session/region_session.cpp b/src/client/session/region_session.cpp index 03d5511..8f24c34 100644 --- a/src/client/session/region_session.cpp +++ b/src/client/session/region_session.cpp @@ -1,5 +1,6 @@ #include "evo/client/region_session.hpp" #include +#include #include namespace evo::client { @@ -41,13 +42,21 @@ struct RegionSessionClient::Impl { void seen_tick(std::uint64_t tick) { server_tick = std::max(server_tick, tick); } + // A protocol close names its cause on stderr: which channel, the codec or assembly + // error, or the message alternative and version that was not expected here. + void protocol_close(const char* where, int detail, std::size_t bytes) { + std::fprintf(stderr, "session protocol close: %s detail=%d bytes=%zu state=%d\n", where, + detail, bytes, static_cast(state)); + end(SessionCloseReason::protocol, true); + } // Datagrams: receipts and watermarks only, after Welcome. void datagram(std::span bytes) { if (state != RegionSessionState::established) return; const auto decoded = network::decode_session(bytes); if (!decoded) - return end(SessionCloseReason::protocol, true); + return protocol_close("datagram decode", static_cast(decoded.error()), + bytes.size()); if (const auto* m = std::get_if(&*decoded)) { seen_tick(m->server_tick); return keep(intention_receipts, *m); @@ -59,8 +68,8 @@ struct RegionSessionClient::Impl { if (!snapshots) return; // Before Welcome (channels are not ordered): the next tick resends. const auto accepted = snapshots->accept(*m); - if (!accepted) - return end(SessionCloseReason::protocol, true); // Malformed snapshot. + if (!accepted) // Malformed snapshot. + return protocol_close("snapshot", static_cast(accepted.error()), bytes.size()); if (const auto ack = accepted.value_or(std::nullopt); ack && connection != 0) // A lost ack only means the next delta is against an older baseline. (void)endpoint @@ -76,7 +85,7 @@ struct RegionSessionClient::Impl { simulated = *m; return; } - end(SessionCloseReason::protocol, true); + protocol_close("datagram unexpected", static_cast(decoded->index()), bytes.size()); } bool send(const network::SessionMessage& m) { @@ -100,7 +109,8 @@ struct RegionSessionClient::Impl { std::uint16_t wire_version{}; const auto decoded = network::decode_session(bytes, &wire_version); if (!decoded) - return end(SessionCloseReason::protocol, true); + return protocol_close("message decode", static_cast(decoded.error()), + bytes.size()); if (wire_version != protocol_version) return end(SessionCloseReason::unsupported_version, true); if (const auto* m = std::get_if(&*decoded)) @@ -146,7 +156,8 @@ struct RegionSessionClient::Impl { return; } } - end(SessionCloseReason::protocol, true); + protocol_close("message unexpected", + static_cast(decoded->index()) * 100 + wire_version, bytes.size()); } }; diff --git a/src/server/session/region_sessions.cpp b/src/server/session/region_sessions.cpp index ff0fdb1..efc8ed4 100644 --- a/src/server/session/region_sessions.cpp +++ b/src/server/session/region_sessions.cpp @@ -10,6 +10,17 @@ using network::SessionCloseReason; using network::SessionGrantError; using Clock = std::chrono::steady_clock; +// The wire outcome names a life only once it is born; the codec refuses an identity or +// commit on any other result. A host may report a pending or refused request's reserved +// identity, which stays server-side. +network::PrimitiveLifeOutcome wire_outcome(network::PrimitiveLifeOutcome outcome) { + if (outcome.result != network::PrimitiveLifeResult::born) { + outcome.life_identity = 0; + outcome.commit_sequence = 0; + } + return outcome; +} + SessionCloseReason reason_for(ControlError e) { switch (e) { case ControlError::wrong_environment: @@ -651,14 +662,16 @@ struct RegionSessions::Impl { : network::AdmitStatus::admitted; send(c, network::PrimitiveLifeReceipt{m->request_id, status, facts.simulated_tick}); if (status == network::AdmitStatus::admitted) - send(c, config.create_primitive_life(c.account_id, c.generation, m->request_id)); + send(c, wire_outcome(config.create_primitive_life(c.account_id, c.generation, + m->request_id))); return; } if (const auto* m = std::get_if(&*decoded)) { if (c.generation == 0) return send(c, network::PrimitiveLifeOutcome{ m->request_id, network::PrimitiveLifeResult::unknown, 0, 0}); - return send(c, config.query_primitive_life(c.account_id, c.generation, m->request_id)); + return send(c, wire_outcome(config.query_primitive_life(c.account_id, c.generation, + m->request_id))); } close(c, SessionCloseReason::protocol, now); } diff --git a/tests/quic_sessions.cpp b/tests/quic_sessions.cpp index 09dce6b..5a86c6c 100644 --- a/tests/quic_sessions.cpp +++ b/tests/quic_sessions.cpp @@ -640,8 +640,13 @@ void cellular_v5_spawn_and_v7_action_share_region_sessions(const Files& f) { f, 5, 64, &control, [&](server::RegionSessionsConfig& c) { c.actions = &actions; c.accept_cellular_actions = true; + // Like the cellular host, a refusal reports the reserved identity; only a + // born outcome may carry it on the wire. c.create_primitive_life = [](const AccountId&, std::uint64_t, std::uint64_t request) { - return PrimitiveLifeOutcome{request, PrimitiveLifeResult::born, 901, 5}; + return request == 45 + ? PrimitiveLifeOutcome{request, PrimitiveLifeResult::existing_life, 902, + 0} + : PrimitiveLifeOutcome{request, PrimitiveLifeResult::born, 901, 5}; }; c.query_primitive_life = [](const AccountId&, std::uint64_t, std::uint64_t request) { return PrimitiveLifeOutcome{request, PrimitiveLifeResult::pending, 0, 0}; @@ -666,6 +671,13 @@ void cellular_v5_spawn_and_v7_action_share_region_sessions(const Files& f) { CHECK(h.until( [&] { return !(birth_outcomes = spawn_client->take_primitive_life_outcomes()).empty(); })); CHECK(birth_outcomes.front() == PrimitiveLifeOutcome{44, PrimitiveLifeResult::born, 901, 5}); + // A later client's new request is refused; the session stays open with a valid outcome. + CHECK(spawn_client->request_primitive_life(45)); + CHECK(h.until( + [&] { return !(birth_outcomes = spawn_client->take_primitive_life_outcomes()).empty(); })); + CHECK(birth_outcomes.front() == + PrimitiveLifeOutcome{45, PrimitiveLifeResult::existing_life, 0, 0} && + spawn_client->state() == RegionSessionState::established); CHECK(action_client->send_cellular_action(55, 101, 0, 0)); std::vector receipts;