fix: clean up refactoring leftovers (#1264)

This commit addresses issues that were likely introduced during a rebase
related to:
b0f23df165

Change dual channel replication state in main handler only

Signed-off-by: naglera <anagler123@gmail.com>
This commit is contained in:
Amit Nagler 2024-11-05 14:57:34 +02:00 committed by GitHub
parent 3c32ee1bda
commit 48ebe21ad1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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;
}