fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

Sentinel: failover abort function simplified.

Browse Source
This commit is contained in:
antirez 2013-11-18 11:43:35 +01:00
parent e0750acf11
commit 3a374b0511
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/sentinel.c
View File

@ -1155,7 +1155,7 @@ int sentinelResetMastersByPattern(char *pattern, int flags) {
/* Reset the specified master with sentinelResetMaster(), and also change /* Reset the specified master with sentinelResetMaster(), and also change
* the ip:port address, but take the name of the instance unmodified. * the ip:port address, but take the name of the instance unmodified.
* *
* This is used to handle the +switch-master and +redirect-to-master events. * This is used to handle the +switch-master event.
* *
* The function returns REDIS_ERR if the address can't be resolved for some * The function returns REDIS_ERR if the address can't be resolved for some
* reason. Otherwise REDIS_OK is returned. */ * reason. Otherwise REDIS_OK is returned. */
@ -3061,40 +3061,15 @@ void sentinelFailoverStateMachine(sentinelRedisInstance *ri) {
* *
* This function can only be called before the promoted slave acknowledged * This function can only be called before the promoted slave acknowledged
* the slave -> master switch. Otherwise the failover can't be aborted and * the slave -> master switch. Otherwise the failover can't be aborted and
* will reach its end. * will reach its end (possibly by timeout). */
*
* If there is a promoted slave and we already got acknowledge of the
* slave -> master switch, we clear our flags and redirect to the
* new master. Eventually the config will be propagated if it is the one
* with the greater config epoch for this master.
*
* Otherwise if we still did not received the acknowledgement from the
* promoted slave, or there is no promoted slave at all, we just clear the
* failover-in-progress state as there is nothing to do (if the promoted
* slave for some reason actually received our "SLAVEOF NO ONE" command
* even if we did not received the ACK, it will be reverted to slave again
* by one of the Sentinels). */
void sentinelAbortFailover(sentinelRedisInstance *ri) { void sentinelAbortFailover(sentinelRedisInstance *ri) {
dictIterator *di;
dictEntry *de;
redisAssert(ri->flags & SRI_FAILOVER_IN_PROGRESS); redisAssert(ri->flags & SRI_FAILOVER_IN_PROGRESS);
redisAssert(ri->failover_state <= SENTINEL_FAILOVER_STATE_WAIT_PROMOTION); redisAssert(ri->failover_state <= SENTINEL_FAILOVER_STATE_WAIT_PROMOTION);
/* Clear failover related flags from slaves. */
di = dictGetIterator(ri->slaves);
while((de = dictNext(di)) != NULL) {
sentinelRedisInstance *slave = dictGetVal(de);
slave->flags &= ~(SRI_RECONF_SENT|SRI_RECONF_INPROG|SRI_RECONF_DONE);
}
dictReleaseIterator(di);
ri->flags &= ~(SRI_FAILOVER_IN_PROGRESS|SRI_FORCE_FAILOVER); ri->flags &= ~(SRI_FAILOVER_IN_PROGRESS|SRI_FORCE_FAILOVER);
ri->failover_state = SENTINEL_FAILOVER_STATE_NONE; ri->failover_state = SENTINEL_FAILOVER_STATE_NONE;
ri->failover_state_change_time = mstime(); ri->failover_state_change_time = mstime();
if (ri->promoted_slave) { if (ri->promoted_slave) {
sentinelCallClientReconfScript(ri,SENTINEL_LEADER,"abort",
ri->promoted_slave->addr,ri->addr);
ri->promoted_slave->flags &= ~SRI_PROMOTED; ri->promoted_slave->flags &= ~SRI_PROMOTED;
ri->promoted_slave = NULL; ri->promoted_slave = NULL;
} }