fix(guard): add cache clearing to ws retry, increase ws retries #2448
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
How to use the Graphite Merge QueueAdd the label merge-queue to this PR to add it to the merge queue. You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has enabled the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. This stack of pull requests is managed by Graphite. Learn more about stacking. |
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This PR enhances WebSocket connection reliability in the guard service by modifying retry behavior and cache management.
- Increased WebSocket retry attempts from 4 to 7 and decreased initial interval from 250ms to 150ms in
packages/edge/infra/guard/server/src/main.rs - Added cache clearing during WebSocket retries in
packages/edge/infra/guard/core/src/proxy_service.rsto ensure fresh routing on retry - Made target parameter mutable in
handle_websocket_upgradeto allow route updates during retries - Removed outdated comments about retry configuration
2 file(s) reviewed, 1 comment(s)
Edit PR Review Bot Settings | Greptile
Comment on lines
+1216
to
+1224
| match new_target { | ||
| Ok(ResolveRouteOutput::Target(new_target)) => { | ||
| target = new_target; | ||
| } | ||
| Ok(ResolveRouteOutput::Response(_response)) => { | ||
| error!("Expected target, got response") | ||
| } | ||
| Err(e) => error!("Routing error: {}", e), | ||
| } |
There was a problem hiding this comment.
logic: Should propagate routing errors to client with appropriate close code rather than just logging
Suggested change
| match new_target { | |
| Ok(ResolveRouteOutput::Target(new_target)) => { | |
| target = new_target; | |
| } | |
| Ok(ResolveRouteOutput::Response(_response)) => { | |
| error!("Expected target, got response") | |
| } | |
| Err(e) => error!("Routing error: {}", e), | |
| } | |
| match new_target { | |
| Ok(ResolveRouteOutput::Target(new_target)) => { | |
| target = new_target; | |
| } | |
| Ok(ResolveRouteOutput::Response(_response)) => { | |
| error!("Expected target, got response"); | |
| // Send close with internal error code | |
| let _ = client_sink.send(hyper_tungstenite::tungstenite::Message::Close(Some( | |
| hyper_tungstenite::tungstenite::protocol::CloseFrame { | |
| code: 1011.into(), // Internal error | |
| reason: "Routing error: unexpected response".into(), | |
| } | |
| ))).await; | |
| return; | |
| } | |
| Err(e) => { | |
| error!("Routing error: {}", e); | |
| // Send close with internal error code | |
| let _ = client_sink.send(hyper_tungstenite::tungstenite::Message::Close(Some( | |
| hyper_tungstenite::tungstenite::protocol::CloseFrame { | |
| code: 1011.into(), // Internal error | |
| reason: format!("Routing error: {}", e).into(), | |
| } | |
| ))).await; | |
| return; | |
| } | |
| } |
Deploying rivet with
|
| Latest commit: |
63e9908
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://5088259b.rivet.pages.dev |
| Branch Preview URL: | https://graphite-base-2446.rivet.pages.dev |
NathanFlurry
force-pushed
the
05-17-fix_guard_add_cache_clearing_to_ws_retry_increase_ws_retries
branch
from
5ae1f6e to
63e9908
Compare
Deploying rivet-studio with
|
| Latest commit: |
63e9908
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://ee92d214.rivet-studio.pages.dev |
| Branch Preview URL: | https://graphite-base-2446.rivet-studio.pages.dev |
Deploying rivet-studio with
|
| Latest commit: |
63e9908
|
| Status: | ⚡️ Build in progress... |
This was referenced May 23, 2025
Deploying rivet-hub with
|
| Latest commit: |
63e9908
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://c2b17a1c.rivet-hub-7jb.pages.dev |
| Branch Preview URL: | https://graphite-base-2446.rivet-hub-7jb.pages.dev |
NathanFlurry
approved these changes
May 23, 2025
Contributor
Merge activity
|
graphite-app bot
pushed a commit
that referenced
this pull request
May 23, 2025
<!-- Please make sure there is an issue that this PR is correlated to. --> ## Changes <!-- If there are frontend changes, please include screenshots. -->
graphite-app
bot
deleted the
05-17-fix_guard_add_cache_clearing_to_ws_retry_increase_ws_retries
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes