fix(buffer): Reject envelope when buffer is down#5746
Open
fix(buffer): Reject envelope when buffer is down#5746
Conversation
Verifies that relay completes in-flight HTTP requests before shutting down on SIGTERM, and rejects new connections once the listener closes. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
jjbayer
commented
Mar 20, 2026
Comment on lines
+146
to
+149
| relay_log::warn!( | ||
| error = &self as &dyn std::error::Error, | ||
| "not handling request: service unavailable" | ||
| ); |
Member
Author
There was a problem hiding this comment.
Downgraded from error to warning here because events are not necessarily lost, as long as the client retries 503s. We will still see the warning in Sentry.
tobias-wilfert
approved these changes
Mar 20, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The new test in
test_shutdown.pyreproduces the following failure mode:EnvelopeBufferServicereceives the shutdown signal.EnvelopeBufferServicewrites all pending envelopes to disk and breaks out of its service loop (seeEnvelopeBufferService::handle_shutdown).ObservableEnvelopeBuffer::try_pushwith the in-flight envelopes.self.addr.sendfails because the receiving end of the channel is gone.There should only be one such in-flight request per connection, but we have quite a high number of connections open on each Relay pod.
With this PR, the server responds with an explicit 503 during shutdown, so the request can be retried on a different instance.
In a follow-up PR, I want to change the flushing behavior to optionally not save the internal state to disk, because it makes no sense for ephemeral disks.
Fixes: INGEST-510