Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
80da056c
Commit
80da056c
authored
Nov 06, 2013
by
antirez
Browse files
Sentinel: sentinelSendSlaveOf() was missing a var and the prototype.
parent
23800d9e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/sentinel.c
View file @
80da056c
...
@@ -327,6 +327,7 @@ sentinelRedisInstance *sentinelSelectSlave(sentinelRedisInstance *master);
...
@@ -327,6 +327,7 @@ sentinelRedisInstance *sentinelSelectSlave(sentinelRedisInstance *master);
void sentinelScheduleScriptExecution(char *path, ...);
void sentinelScheduleScriptExecution(char *path, ...);
void sentinelStartFailover(sentinelRedisInstance *master, int state);
void sentinelStartFailover(sentinelRedisInstance *master, int state);
void sentinelDiscardReplyCallback(redisAsyncContext *c, void *reply, void *privdata);
void sentinelDiscardReplyCallback(redisAsyncContext *c, void *reply, void *privdata);
int sentinelSendSlaveOf(sentinelRedisInstance *ri, char *host, int port);
/* ========================= Dictionary types =============================== */
/* ========================= Dictionary types =============================== */
...
@@ -2535,6 +2536,7 @@ char *sentinelGetObjectiveLeader(sentinelRedisInstance *master) {
...
@@ -2535,6 +2536,7 @@ char *sentinelGetObjectiveLeader(sentinelRedisInstance *master) {
* discarded. */
* discarded. */
int sentinelSendSlaveOf(sentinelRedisInstance *ri, char *host, int port) {
int sentinelSendSlaveOf(sentinelRedisInstance *ri, char *host, int port) {
char portstr[32];
char portstr[32];
int retval;
ll2string(portstr,sizeof(portstr),port);
ll2string(portstr,sizeof(portstr),port);
...
@@ -2899,7 +2901,6 @@ void sentinelFailoverReconfNextSlave(sentinelRedisInstance *master) {
...
@@ -2899,7 +2901,6 @@ void sentinelFailoverReconfNextSlave(sentinelRedisInstance *master) {
{
{
sentinelRedisInstance *slave = dictGetVal(de);
sentinelRedisInstance *slave = dictGetVal(de);
int retval;
int retval;
char
master_port
[
32
];
/* Skip the promoted slave, and already configured slaves. */
/* Skip the promoted slave, and already configured slaves. */
if (slave->flags & (SRI_PROMOTED|SRI_RECONF_DONE)) continue;
if (slave->flags & (SRI_PROMOTED|SRI_RECONF_DONE)) continue;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment