feat(server): add connections send timeout #4874
Merged
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
Signed-off-by: adi_holden <[email protected]>
romange
reviewed
Apr 1, 2025
src/server/server_state.cc
Outdated
| @@ -262,8 +265,9 @@ void ServerState::ConnectionsWatcherFb(util::ListenerInterface* main) { | |||
| is_replica = dfly_conn->cntx()->replica_conn; | |||
| } | |||
|
|
|||
| if ((phase == Phase::READ_SOCKET || dfly_conn->IsSending()) && !is_replica && | |||
| dfly_conn->idle_time() > timeout) { | |||
| if ((timeout != 0 && phase == Phase::READ_SOCKET && !is_replica && | |||
There was a problem hiding this comment.
please factor out into 2 boolean variables for clarity: idle_read and stuck_sending
btw, I think for stuck_sending you also need !is_replica because we have a different setting to break replication connections.
romange
reviewed
Apr 1, 2025
|
|
||
| async def get_task(): | ||
| while True: | ||
| writer.write(f"GET a\n".encode()) |
There was a problem hiding this comment.
I see we use await writer.drain() after calling write
romange
reviewed
Apr 1, 2025
| @dfly_args({"send_timeout": 3}) | ||
| async def test_send_timeout(df_server, async_client: aioredis.Redis): | ||
| reader, writer = await asyncio.open_connection("127.0.0.1", df_server.port) | ||
| writer.write(f"client setname writer_test\n".encode()) |
There was a problem hiding this comment.
await writer.drain() here
romange
reviewed
Apr 1, 2025
Signed-off-by: adi_holden <[email protected]>
romange
approved these changes
Apr 2, 2025
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.
fixes #4828