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

Cluster: clusterCloseAllSlots() added.

Browse Source
This commit is contained in:
antirez 2014-03-11 11:16:18 +01:00
parent 8eae54aa1e
commit 2e8e0ad44e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cluster.c
View File

@ -68,6 +68,7 @@ int bitmapTestBit(unsigned char *bitmap, int pos);
void clusterDoBeforeSleep(int flags); void clusterDoBeforeSleep(int flags);
void clusterSendUpdate(clusterLink *link, clusterNode *node); void clusterSendUpdate(clusterLink *link, clusterNode *node);
void resetManualFailover(void); void resetManualFailover(void);
void clusterCloseAllSlots(void);
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Initialization * Initialization
@ -309,12 +310,8 @@ void clusterInit(void) {
server.cluster->last_vote_epoch = 0; server.cluster->last_vote_epoch = 0;
server.cluster->stats_bus_messages_sent = 0; server.cluster->stats_bus_messages_sent = 0;
server.cluster->stats_bus_messages_received = 0; server.cluster->stats_bus_messages_received = 0;
memset(server.cluster->migrating_slots_to,0, memset(server.cluster->slots,0, sizeof(server.cluster->slots));
sizeof(server.cluster->migrating_slots_to)); clusterCloseAllSlots();
memset(server.cluster->importing_slots_from,0,
sizeof(server.cluster->importing_slots_from));
memset(server.cluster->slots,0,
sizeof(server.cluster->slots));
if (clusterLoadConfig(server.cluster_configfile) == REDIS_ERR) { if (clusterLoadConfig(server.cluster_configfile) == REDIS_ERR) {
/* No configuration found. We will just use the random name provided /* No configuration found. We will just use the random name provided
* by the createClusterNode() function. */ * by the createClusterNode() function. */
@ -2716,6 +2713,15 @@ int clusterDelNodeSlots(clusterNode *node) {
return deleted; return deleted;
} }
/* Clear the migrating / importing state for all the slots.
* This is useful at initialization and when turning a master into slave. */
void clusterCloseAllSlots(void) {
memset(server.cluster->migrating_slots_to,0,
sizeof(server.cluster->migrating_slots_to));
memset(server.cluster->importing_slots_from,0,
sizeof(server.cluster->importing_slots_from));
}
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Cluster state evaluation function * Cluster state evaluation function
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */