mirror of
https://github.com/openai/codex.git
synced 2026-11-19 22:30:42 +00:00
Preserve per-session routing for gRPC code mode (#52381)
## Why Sessions sharing a transport can be admitted to different hosts. Each session needs its own routing token so subsequent RPCs reach the host holding its state. ## What changed - Capture the optional `x-code-mode-route` metadata from successful `OpenSession` responses and attach it to subsequent session RPCs. Reject tokens longer than 256 bytes and keep new admission attempts free of existing session routes. - Invalidate a routed session when an `Unavailable` response explicitly sets `x-code-mode-route-lost: true`, allowing a later operation to reopen it without replaying the failed execution. Ordinary `Unavailable` responses preserve the session. - Allow up to five admission attempts for `Unavailable` and `ResourceExhausted`, with an immediate first retry followed by jittered exponential backoff. - Order session failure with shutdown so late callback errors cannot cancel an in-flight `CloseSession` RPC. ## Testing Add regression coverage for independent routing on a shared provider, route-loss recovery without execution replay, preservation of unaffected session state, and callback failures racing shutdown. Extend admission tests to verify the five-attempt limit and recovery tests to distinguish explicit route loss from ordinary unavailability. GitOrigin-RevId: 5d60ef1afa56beb8c70ba7ab27865128225b0d3d
This commit is contained in:
committed by
copyberry
parent
03b761dca9
commit
5b3c1522f8
@@ -124,7 +124,7 @@ impl SessionInner {
|
||||
.saturating_add(Duration::from_secs(1));
|
||||
let opening = async {
|
||||
let mut client = self.client();
|
||||
let mut request = tonic::Request::new(request);
|
||||
let mut request = self.request(request);
|
||||
if let Some(traceparent) = trace.and_then(|trace| trace.traceparent)
|
||||
&& let Ok(traceparent) = traceparent.parse()
|
||||
{
|
||||
@@ -321,8 +321,13 @@ impl SessionInner {
|
||||
grpc::yield_observation_request::Observation::WaitId(wait_id),
|
||||
)
|
||||
});
|
||||
let response =
|
||||
deadline::session_request(self, "wait", runtime_timeout, client.wait(request)).await;
|
||||
let response = deadline::session_request(
|
||||
self,
|
||||
"wait",
|
||||
runtime_timeout,
|
||||
client.wait(self.request(request)),
|
||||
)
|
||||
.await;
|
||||
drop(watcher);
|
||||
cancellation.disarm();
|
||||
self.prune_wait_slots();
|
||||
@@ -336,10 +341,10 @@ impl SessionInner {
|
||||
observation: grpc::yield_observation_request::Observation,
|
||||
) -> AbortOnDropHandle<()> {
|
||||
let mut client = self.client();
|
||||
let request = grpc::YieldObservationRequest {
|
||||
let request = self.request(grpc::YieldObservationRequest {
|
||||
session_id: self.id.clone(),
|
||||
observation: Some(observation),
|
||||
};
|
||||
});
|
||||
AbortOnDropHandle::new(tokio::spawn(async move {
|
||||
yield_signal.cancelled().await;
|
||||
if let Err(error) = deadline::startup("yield observation", async move {
|
||||
@@ -360,10 +365,10 @@ impl SessionInner {
|
||||
self,
|
||||
"termination",
|
||||
Duration::ZERO,
|
||||
client.terminate(grpc::TerminateRequest {
|
||||
client.terminate(self.request(grpc::TerminateRequest {
|
||||
session_id: self.id.clone(),
|
||||
cell_id: cell_id.as_str().to_string(),
|
||||
}),
|
||||
})),
|
||||
)
|
||||
.await?
|
||||
.into_inner();
|
||||
@@ -467,10 +472,10 @@ impl Drop for WaitCancellation {
|
||||
&session,
|
||||
"wait cancellation",
|
||||
Duration::ZERO,
|
||||
client.cancel_wait(grpc::CancelWaitRequest {
|
||||
client.cancel_wait(session.request(grpc::CancelWaitRequest {
|
||||
session_id: session.id.clone(),
|
||||
wait_id,
|
||||
}),
|
||||
})),
|
||||
)
|
||||
.await;
|
||||
if let Err(error) = result
|
||||
|
||||
Reference in New Issue
Block a user