From 48ebe21ad1a30eee60c22fe8235118f4c6b1aed3 Mon Sep 17 00:00:00 2001 From: Amit Nagler <58042354+naglera@users.noreply.github.com> Date: Tue, 5 Nov 2024 14:57:34 +0200 Subject: [PATCH] fix: clean up refactoring leftovers (#1264) This commit addresses issues that were likely introduced during a rebase related to: https://github.com/valkey-io/valkey/commit/b0f23df16522e91a769c75646166045ae70e8d4e Change dual channel replication state in main handler only Signed-off-by: naglera --- src/replication.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/replication.c b/src/replication.c index 8ff8ad3f0f..6e8faff7a2 100644 --- a/src/replication.c +++ b/src/replication.c @@ -3247,7 +3247,6 @@ int dualChannelReplMainConnSendHandshake(connection *conn, sds *err) { ull2string(llstr, sizeof(llstr), server.rdb_client_id); *err = sendCommand(conn, "REPLCONF", "set-rdb-client-id", llstr, NULL); if (*err) return C_ERR; - server.repl_state = REPL_STATE_RECEIVE_CAPA_REPLY; return C_OK; } @@ -3258,7 +3257,6 @@ int dualChannelReplMainConnRecvCapaReply(connection *conn, sds *err) { serverLog(LL_NOTICE, "Primary does not understand REPLCONF identify: %s", *err); return C_ERR; } - server.repl_state = REPL_STATE_SEND_PSYNC; return C_OK; } @@ -3269,7 +3267,6 @@ int dualChannelReplMainConnSendPsync(connection *conn, sds *err) { *err = sdsnew(connGetLastError(conn)); return C_ERR; } - server.repl_state = REPL_STATE_RECEIVE_PSYNC_REPLY; return C_OK; }