fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-21 18:10:49 +00:00
Code Issues Projects Releases Wiki Activity

Sentinel: fix SENTINEL SET error reporting.

Browse Source 
Thanks to @shenlongxing for reporting the problem.
Related to .
This commit is contained in:
antirez 2018-06-26 09:15:46 +02:00
parent fc0c9c8097
commit 3cf8dd2c84
1 changed files with 18 additions and 9 deletions

27
src/sentinel.c

@ -3380,7 +3380,8 @@ void sentinelRoleCommand(client *c) {
void sentinelSetCommand(client *c) { void sentinelSetCommand(client *c) {
sentinelRedisInstance *ri; sentinelRedisInstance *ri;
int j, changes = 0; int j, changes = 0;
char *option, *value; int badarg = 0; /* Bad argument position for error reporting. */
char *option;
if ((ri = sentinelGetMasterByNameOrReplyError(c,c->argv[2])) if ((ri = sentinelGetMasterByNameOrReplyError(c,c->argv[2]))
== NULL) return; == NULL) return;
@ -3395,28 +3396,34 @@ void sentinelSetCommand(client *c) {
if (!strcasecmp(option,"down-after-milliseconds") && moreargs > 0) { if (!strcasecmp(option,"down-after-milliseconds") && moreargs > 0) {
/* down-after-millisecodns <milliseconds> */ /* down-after-millisecodns <milliseconds> */
robj *o = c->argv[++j]; robj *o = c->argv[++j];
if (getLongLongFromObject(o,&ll) == C_ERR || ll <= 0) if (getLongLongFromObject(o,&ll) == C_ERR || ll <= 0) {
badarg = j;
goto badfmt; goto badfmt;
}
ri->down_after_period = ll; ri->down_after_period = ll;
sentinelPropagateDownAfterPeriod(ri); sentinelPropagateDownAfterPeriod(ri);
changes++; changes++;
} else if (!strcasecmp(option,"failover-timeout") && moreargs > 0) { } else if (!strcasecmp(option,"failover-timeout") && moreargs > 0) {
/* failover-timeout <milliseconds> */ /* failover-timeout <milliseconds> */
robj *o = c->argv[++j]; robj *o = c->argv[++j];
if (getLongLongFromObject(o,&ll) == C_ERR || ll <= 0) if (getLongLongFromObject(o,&ll) == C_ERR || ll <= 0) {
badarg = j;
goto badfmt; goto badfmt;
}
ri->failover_timeout = ll; ri->failover_timeout = ll;
changes++; changes++;
} else if (!strcasecmp(option,"parallel-syncs") && moreargs > 0) { } else if (!strcasecmp(option,"parallel-syncs") && moreargs > 0) {
/* parallel-syncs <milliseconds> */ /* parallel-syncs <milliseconds> */
robj *o = c->argv[++j]; robj *o = c->argv[++j];
if (getLongLongFromObject(o,&ll) == C_ERR || ll <= 0) if (getLongLongFromObject(o,&ll) == C_ERR || ll <= 0) {
badarg = j;
goto badfmt; goto badfmt;
}
ri->parallel_syncs = ll; ri->parallel_syncs = ll;
changes++; changes++;
} else if (!strcasecmp(option,"notification-script") && moreargs > 0) { } else if (!strcasecmp(option,"notification-script") && moreargs > 0) {
/* notification-script <path> */ /* notification-script <path> */
value = c->argv[++j]->ptr; char *value = c->argv[++j]->ptr;
if (sentinel.deny_scripts_reconfig) { if (sentinel.deny_scripts_reconfig) {
addReplyError(c, addReplyError(c,
"Reconfiguration of scripts path is denied for " "Reconfiguration of scripts path is denied for "
@ -3436,7 +3443,7 @@ void sentinelSetCommand(client *c) {
changes++; changes++;
} else if (!strcasecmp(option,"client-reconfig-script") && moreargs > 0) { } else if (!strcasecmp(option,"client-reconfig-script") && moreargs > 0) {
/* client-reconfig-script <path> */ /* client-reconfig-script <path> */
value = c->argv[++j]->ptr; char *value = c->argv[++j]->ptr;
if (sentinel.deny_scripts_reconfig) { if (sentinel.deny_scripts_reconfig) {
addReplyError(c, addReplyError(c,
"Reconfiguration of scripts path is denied for " "Reconfiguration of scripts path is denied for "
@ -3457,15 +3464,17 @@ void sentinelSetCommand(client *c) {
changes++; changes++;
} else if (!strcasecmp(option,"auth-pass") && moreargs > 0) { } else if (!strcasecmp(option,"auth-pass") && moreargs > 0) {
/* auth-pass <password> */ /* auth-pass <password> */
value = c->argv[++j]->ptr; char *value = c->argv[++j]->ptr;
sdsfree(ri->auth_pass); sdsfree(ri->auth_pass);
ri->auth_pass = strlen(value) ? sdsnew(value) : NULL; ri->auth_pass = strlen(value) ? sdsnew(value) : NULL;
changes++; changes++;
} else if (!strcasecmp(option,"quorum") && moreargs > 0) { } else if (!strcasecmp(option,"quorum") && moreargs > 0) {
/* quorum <count> */ /* quorum <count> */
robj *o = c->argv[++j]; robj *o = c->argv[++j];
if (getLongLongFromObject(o,&ll) == C_ERR || ll <= 0) if (getLongLongFromObject(o,&ll) == C_ERR || ll <= 0) {
badarg = j;
goto badfmt; goto badfmt;
}
ri->quorum = ll; ri->quorum = ll;
changes++; changes++;
} else if (!strcasecmp(option,"rename-command") && moreargs > 1) { } else if (!strcasecmp(option,"rename-command") && moreargs > 1) {
@ -3516,7 +3525,7 @@ void sentinelSetCommand(client *c) {
badfmt: /* Bad format errors */ badfmt: /* Bad format errors */
if (changes) sentinelFlushConfig(); if (changes) sentinelFlushConfig();
addReplyErrorFormat(c,"Invalid argument '%s' for SENTINEL SET '%s'", addReplyErrorFormat(c,"Invalid argument '%s' for SENTINEL SET '%s'",
value, option); c->argv[badarg]->ptr,option);
} }
/* Our fake PUBLISH command: it is actually useful only to receive hello messages /* Our fake PUBLISH command: it is actually useful only to receive hello messages