fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-25 10:32:14 +00:00
Code Issues Projects Releases Wiki Activity

Cluster: replica migration should only work for masters serving slots.

Browse Source
This commit is contained in:
antirez 2014-02-10 17:08:37 +01:00
parent f106a79309
commit 5b2082ead3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cluster.c
View File

@ -2264,7 +2264,7 @@ void clusterHandleSlaveMigration(int max_slaves) {
if (nodeIsSlave(node) || nodeFailed(node)) continue; if (nodeIsSlave(node) || nodeFailed(node)) continue;
okslaves = clusterCountNonFailingSlaves(node); okslaves = clusterCountNonFailingSlaves(node);
if (okslaves == 0 && target == NULL) target = node; if (okslaves == 0 && target == NULL && node->numslots > 0) target = node;
if (okslaves == max_slaves) { if (okslaves == max_slaves) {
for (j = 0; j < node->numslaves; j++) { for (j = 0; j < node->numslaves; j++) {
if (memcmp(node->slaves[j]->name, if (memcmp(node->slaves[j]->name,
@ -2487,7 +2487,7 @@ void clusterCron(void) {
if (nodeIsSlave(myself) && nodeIsMaster(node) && !nodeFailed(node)) { if (nodeIsSlave(myself) && nodeIsMaster(node) && !nodeFailed(node)) {
int okslaves = clusterCountNonFailingSlaves(node); int okslaves = clusterCountNonFailingSlaves(node);
if (okslaves == 0) orphaned_masters++; if (okslaves == 0 && node->numslots > 0) orphaned_masters++;
if (okslaves > max_slaves) max_slaves = okslaves; if (okslaves > max_slaves) max_slaves = okslaves;
if (nodeIsSlave(myself) && myself->slaveof == node) if (nodeIsSlave(myself) && myself->slaveof == node)
this_slaves = okslaves; this_slaves = okslaves;