Skip to content
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

replication: fix io-threads possible race by moving waitForClientIO #1422

Open
wants to merge 2 commits into
base: unstable
Choose a base branch
from
Open

replication: fix io-threads possible race by moving waitForClientIO #1422

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
bbc1829
replication: fix io-threads possible race by moving waitForClientIO e…
uriyage Dec 11, 2024
756c3dc
Add assert to conn write/read
uriyage Dec 24, 2024
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
5 changes: 3 additions & 2 deletions src/replication.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,9 @@ void syncCommand(client *c) {
/* ignore SYNC if already replica or in monitor mode */
if (c->flag.replica) return;

/* Wait for any IO pending operation to finish before changing the client state to replica */
waitForClientIO(c);

/* Check if this is a failover request to a replica with the same replid and
* become a primary if so. */
if (c->argc > 3 && !strcasecmp(c->argv[0]->ptr, "psync") && !strcasecmp(c->argv[3]->ptr, "failover")) {
Expand Down Expand Up @@ -1147,8 +1150,6 @@ void syncCommand(client *c) {
c->repl_state = REPLICA_STATE_WAIT_BGSAVE_START;
if (server.repl_disable_tcp_nodelay) connDisableTcpNoDelay(c->conn); /* Non critical if it fails. */
c->repldbfd = -1;
/* Wait for any IO pending operation to finish before changing the client state */
waitForClientIO(c);
c->flag.replica = 1;
listAddNodeTail(server.replicas, c);

Expand Down
10 changes: 10 additions & 0 deletions src/socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

#include "server.h"
#include "connhelpers.h"
#include "io_threads.h"

/* The connections module provides a lean abstraction of network connections
* to avoid direct socket and async event management across the server code base.
Expand Down Expand Up @@ -154,6 +155,10 @@ static void connSocketClose(connection *conn) {
}

static int connSocketWrite(connection *conn, const void *data, size_t data_len) {
/* Assert the main thread is not writing to a connection that is currently offloaded. */
debugServerAssert(!(conn->flags & CONN_FLAG_ALLOW_ACCEPT_OFFLOAD) || !inMainThread() ||
((client *)connGetPrivateData(conn))->io_write_state != CLIENT_PENDING_IO);

int ret = write(conn->fd, data, data_len);
if (ret < 0 && errno != EAGAIN) {
conn->last_errno = errno;
Expand Down Expand Up @@ -182,6 +187,11 @@ static int connSocketWritev(connection *conn, const struct iovec *iov, int iovcn
}

static int connSocketRead(connection *conn, void *buf, size_t buf_len) {
/* Assert the main thread is not reading from a connection that is currently offloaded. */
debugServerAssert(!(conn->flags & CONN_FLAG_ALLOW_ACCEPT_OFFLOAD) || !inMainThread() ||
((client *)connGetPrivateData(conn))->io_read_state != CLIENT_PENDING_IO);


int ret = read(conn->fd, buf, buf_len);
if (!ret) {
conn->state = CONN_STATE_CLOSED;
Expand Down
Loading