Skip to content

Commit

Permalink
Merge branch 'valkey-io:unstable' into unstable
Browse files Browse the repository at this point in the history
  • Loading branch information
parthpatel authored Nov 5, 2024
2 parents 2f4b93a + 48ebe21 commit f8c9b48
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions src/replication.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

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

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

Expand Down

0 comments on commit f8c9b48

Please sign in to comment.