More info about slave up/down in logs

pull/282/head
Nikita 9 years ago
parent 59d94f8a0c
commit 24e2a8818e

@ -548,6 +548,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
protected void slaveDown(ClusterSlotRange slotRange, String host, int port) {
MasterSlaveEntry entry = getEntry(slotRange);
slaveDown(entry, host, port);
log.info("slave: {}:{} has down", host, port);
}
protected void changeMaster(ClusterSlotRange slotRange, String host, int port) {

@ -86,6 +86,7 @@ public class MasterSlaveEntry<E extends ConnectionEntry> {
if (slaveBalancer.getAvailableClients() == 0) {
InetSocketAddress addr = masterEntry.getClient().getAddr();
slaveUp(addr.getHostName(), addr.getPort());
log.info("master {}:{} used as slave", addr.getHostName(), addr.getPort());
}
return conns;
}
@ -109,8 +110,9 @@ public class MasterSlaveEntry<E extends ConnectionEntry> {
public void slaveUp(String host, int port) {
InetSocketAddress addr = masterEntry.getClient().getAddr();
if (!addr.getHostName().equals(host) && port != addr.getPort()) {
if (!addr.getHostName().equals(host) || port != addr.getPort()) {
connectionManager.slaveDown(this, addr.getHostName(), addr.getPort());
log.info("master {}:{} removed from slaves", addr.getHostName(), addr.getPort());
}
slaveBalancer.unfreeze(host, port);
}

@ -235,7 +235,6 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
String addr = ip + ":" + port;
if (freezeSlaves.putIfAbsent(addr, true) == null) {
slaveDown(singleSlotRange, ip, Integer.valueOf(port));
log.info("slave: {} has down", addr);
}
}

Loading…
Cancel
Save