mirror of
https://github.com/fluencelabs/redis
synced 2025-03-18 16:40:50 +00:00
Cluster: replica migration should only work for masters serving slots.
This commit is contained in:
parent
f106a79309
commit
5b2082ead3
@ -2264,7 +2264,7 @@ void clusterHandleSlaveMigration(int max_slaves) {
|
||||
if (nodeIsSlave(node) || nodeFailed(node)) continue;
|
||||
okslaves = clusterCountNonFailingSlaves(node);
|
||||
|
||||
if (okslaves == 0 && target == NULL) target = node;
|
||||
if (okslaves == 0 && target == NULL && node->numslots > 0) target = node;
|
||||
if (okslaves == max_slaves) {
|
||||
for (j = 0; j < node->numslaves; j++) {
|
||||
if (memcmp(node->slaves[j]->name,
|
||||
@ -2487,7 +2487,7 @@ void clusterCron(void) {
|
||||
if (nodeIsSlave(myself) && nodeIsMaster(node) && !nodeFailed(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 (nodeIsSlave(myself) && myself->slaveof == node)
|
||||
this_slaves = okslaves;
|
||||
|
Loading…
x
Reference in New Issue
Block a user