Master should be disabled if any slave up. #1121

pull/1204/head
Nikita 7 years ago
parent d228d47404
commit 9c19eda01d

@ -134,6 +134,11 @@ public class MasterSlaveEntry {
return slaveDown(entry, freezeReason == FreezeReason.SYSTEM); return slaveDown(entry, freezeReason == FreezeReason.SYSTEM);
} }
private void slaveDown(ClientConnectionsEntry entry, FreezeReason freezeReason) {
slaveBalancer.freeze(entry, freezeReason);
slaveDown(entry, freezeReason == FreezeReason.SYSTEM);
}
private boolean slaveDown(ClientConnectionsEntry entry, boolean temporaryDown) { private boolean slaveDown(ClientConnectionsEntry entry, boolean temporaryDown) {
// add master as slave if no more slaves available // add master as slave if no more slaves available
if (!config.checkSkipSlavesInit() && slaveBalancer.getAvailableClients() == 0) { if (!config.checkSkipSlavesInit() && slaveBalancer.getAvailableClients() == 0) {
@ -350,7 +355,7 @@ public class MasterSlaveEntry {
// exclude master from slaves // exclude master from slaves
if (!config.checkSkipSlavesInit() if (!config.checkSkipSlavesInit()
&& (!addr.getAddress().getHostAddress().equals(naddress.getAddress().getHostAddress()) || naddress.getPort() != addr.getPort())) { && (!addr.getAddress().getHostAddress().equals(naddress.getAddress().getHostAddress()) || naddress.getPort() != addr.getPort())) {
slaveDown(address, FreezeReason.SYSTEM); slaveDown(masterEntry, FreezeReason.SYSTEM);
log.info("master {} excluded from slaves", addr); log.info("master {} excluded from slaves", addr);
} }
return true; return true;

Loading…
Cancel
Save