Skip to content

[WIP] add wait_replica_ready to avoid loading err #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
warrick1016 wants to merge 2 commits into
base: feature/ror-update-8.2.0
Choose a base branch
from
Open

[WIP] add wait_replica_ready to avoid loading err #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
343a53f
[fix] avoid io-threads coredump && swap support io-threads
warrick1016 Mar 4, 2026
baa4dc2
[test] restore tcl of io-threads
warrick1016 Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/iothread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@ int isClientMustHandledByMainThread(client *c) {
if (c->flags & (CLIENT_CLOSE_ASAP | CLIENT_MASTER | CLIENT_SLAVE |
CLIENT_PUBSUB | CLIENT_MONITOR | CLIENT_BLOCKED |
CLIENT_UNBLOCKED | CLIENT_TRACKING | CLIENT_LUA_DEBUG |
CLIENT_LUA_DEBUG_SYNC))
CLIENT_LUA_DEBUG_SYNC
#ifdef ENABLE_SWAP
| CLIENT_SWAPPING
#endif
))
{
return 1;
}
Expand Down Expand Up @@ -500,7 +504,7 @@ int processClientsFromIOThread(IOThread *t) {
}

if (t->io_thread_scale_status == IO_THREAD_SCALE_STATUS_DOWN ||
(server.io_threads_scale_status == IO_THREAD_SCALE_STATUS_UP &&
(server.io_threads_scale_status == IO_THREAD_SCALE_STATUS_UP &&
t->io_thread_scale_status != IO_THREAD_SCALE_STATUS_UP)) {
keepClientInMainThread(c);
if (isMultiThreads()) {
Expand Down
3 changes: 2 additions & 1 deletion src/networking.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2563,7 +2563,8 @@ void unprotectClient(client *c) {
if (c->conn) {
if (c->tid == IOTHREAD_MAIN_THREAD_ID)
connSetReadHandler(c->conn,readQueryFromClient);
if (clientHasPendingReplies(c)) putClientInPendingWriteQueue(c);
if (c->tid == IOTHREAD_MAIN_THREAD_ID && clientHasPendingReplies(c))
putClientInPendingWriteQueue(c);
}
}
}
Expand Down
289 changes: 0 additions & 289 deletions tests/swap/unit/io_thread.tcl
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/unit/io_thread.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ proc get_kv_value {input key} {
return ""
}

start_server {tags {"memonly"}} {
start_server {overrides {}} {
r set k v


Expand Down
Loading