github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactoring

Browse Source
pull/456/head
Nikita 9 years ago
parent 6adbd9387f
commit a60d3f491e
7 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/org/redisson/cluster/ClusterConnectionManager.java
Unescape Escape View File

@ -346,8 +346,9 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
failedSlaves.removeAll(currentPart.getFailedSlaveAddresses());
for (URI uri : failedSlaves) {
currentPart.addFailedSlaveAddress(uri);
slaveDown(entry, uri.getHost(), uri.getPort(), FreezeReason.MANAGER);
log.warn("slave: {} has down for slot ranges: {}", uri, currentPart.getSlotRanges());
if (entry.slaveDown(uri.getHost(), uri.getPort(), FreezeReason.MANAGER)) {
log.warn("slave: {} has down for slot ranges: {}", uri, currentPart.getSlotRanges());
}
}
}
@ -358,8 +359,9 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
for (URI uri : removedSlaves) {
currentPart.removeSlaveAddress(uri);
slaveDown(entry, uri.getHost(), uri.getPort(), FreezeReason.MANAGER);
log.info("slave {} removed for slot ranges: {}", uri, currentPart.getSlotRanges());
if (entry.slaveDown(uri.getHost(), uri.getPort(), FreezeReason.MANAGER)) {
log.info("slave {} removed for slot ranges: {}", uri, currentPart.getSlotRanges());
}
}
Set<URI> addedSlaves = new HashSet<URI>(newPart.getSlaveAddresses());

6
src/main/java/org/redisson/connection/ConnectionManager.java
Unescape Escape View File

@ -23,11 +23,11 @@ import java.util.concurrent.TimeUnit;
import org.redisson.MasterSlaveServersConfig;
import org.redisson.client.RedisClient;
import org.redisson.client.RedisConnection;
import org.redisson.client.RedisPubSubConnection;
import org.redisson.client.RedisPubSubListener;
import org.redisson.client.codec.Codec;
import org.redisson.client.protocol.RedisCommand;
import org.redisson.cluster.ClusterSlotRange;
import org.redisson.connection.ClientConnectionsEntry.FreezeReason;
import org.redisson.core.NodeType;
import org.redisson.misc.InfinitySemaphoreLatch;
@ -44,6 +44,8 @@ import io.netty.util.concurrent.Promise;
*/
public interface ConnectionManager {
void reattachPubSub(Collection<RedisPubSubConnection> allPubSubConnections);
boolean isClusterMode();
<R> Future<R> newSucceededFuture(R value);
@ -62,8 +64,6 @@ public interface ConnectionManager {
<R> Future<R> newFailedFuture(Throwable cause);
void slaveDown(MasterSlaveEntry entry, String host, int port, FreezeReason freezeReason);
Collection<RedisClientEntry> getClients();
void shutdownAsync(RedisClient client);

12
src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
Unescape Escape View File

@ -542,13 +542,8 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
return null;
}
public void slaveDown(MasterSlaveEntry entry, String host, int port, FreezeReason freezeReason) {
Collection<RedisPubSubConnection> allPubSubConnections = entry.slaveDown(host, port, freezeReason);
if (allPubSubConnections.isEmpty()) {
return;
}
// reattach listeners to other channels
@Override
public void reattachPubSub(Collection<RedisPubSubConnection> allPubSubConnections) {
for (Entry<String, PubSubConnectionEntry> mapEntry : name2PubSubConnection.entrySet()) {
for (RedisPubSubConnection redisPubSubConnection : allPubSubConnections) {
PubSubConnectionEntry pubSubEntry = mapEntry.getValue();
@ -620,8 +615,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
}
protected void slaveDown(ClusterSlotRange slotRange, String host, int port, FreezeReason freezeReason) {
MasterSlaveEntry entry = getEntry(slotRange);
slaveDown(entry, host, port, freezeReason);
getEntry(slotRange).slaveDown(host, port, freezeReason);
}
protected void changeMaster(ClusterSlotRange slotRange, String host, int port) {

14
src/main/java/org/redisson/connection/MasterSlaveEntry.java
Unescape Escape View File

@ -90,9 +90,11 @@ public class MasterSlaveEntry {
return writeConnectionHolder.add(masterEntry);
}
public Collection<RedisPubSubConnection> slaveDown(String host, int port, FreezeReason freezeReason) {
Collection<RedisPubSubConnection> conns = slaveBalancer.freeze(host, port, freezeReason);
public boolean slaveDown(String host, int port, FreezeReason freezeReason) {
if (!slaveBalancer.freeze(host, port, freezeReason)) {
return false;
}
// add master as slave if no more slaves available
if (config.getReadMode() == ReadMode.SLAVE && slaveBalancer.getAvailableClients() == 0) {
InetSocketAddress addr = masterEntry.getClient().getAddr();
@ -100,7 +102,7 @@ public class MasterSlaveEntry {
log.info("master {}:{} used as slave", addr.getHostName(), addr.getPort());
}
}
return conns;
return true;
}
public Future<Void> addSlave(String host, int port) {
@ -134,7 +136,7 @@ public class MasterSlaveEntry {
// exclude master from slaves
if (config.getReadMode() == ReadMode.SLAVE
&& (!addr.getHostName().equals(host) || port != addr.getPort())) {
connectionManager.slaveDown(this, addr.getHostName(), addr.getPort(), FreezeReason.SYSTEM);
slaveDown(addr.getHostName(), addr.getPort(), FreezeReason.SYSTEM);
log.info("master {}:{} excluded from slaves", addr.getHostName(), addr.getPort());
}
return true;
@ -155,7 +157,7 @@ public class MasterSlaveEntry {
// more than one slave available, so master can be removed from slaves
if (config.getReadMode() == ReadMode.SLAVE
&& slaveBalancer.getAvailableClients() > 1) {
connectionManager.slaveDown(this, host, port, FreezeReason.SYSTEM);
slaveDown(host, port, FreezeReason.SYSTEM);
}
connectionManager.shutdownAsync(oldMaster.getClient());
}

3
src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java
Unescape Escape View File

@ -16,7 +16,6 @@
package org.redisson.connection.balancer;
import java.net.InetSocketAddress;
import java.util.Collection;
import org.redisson.client.RedisConnection;
import org.redisson.client.RedisPubSubConnection;
@ -37,7 +36,7 @@ public interface LoadBalancerManager {
boolean unfreeze(String host, int port, FreezeReason freezeReason);
Collection<RedisPubSubConnection> freeze(String host, int port, FreezeReason freezeReason);
boolean freeze(String host, int port, FreezeReason freezeReason);
Future<Void> add(ClientConnectionsEntry entry);

22
src/main/java/org/redisson/connection/balancer/LoadBalancerManagerImpl.java
Unescape Escape View File

@ -16,10 +16,6 @@
package org.redisson.connection.balancer;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.redisson.MasterSlaveServersConfig;
@ -99,16 +95,20 @@ public class LoadBalancerManagerImpl implements LoadBalancerManager {
return false;
}
public Collection<RedisPubSubConnection> freeze(String host, int port, FreezeReason freezeReason) {
public boolean freeze(String host, int port, FreezeReason freezeReason) {
InetSocketAddress addr = new InetSocketAddress(host, port);
ClientConnectionsEntry connectionEntry = addr2Entry.get(addr);
if (connectionEntry == null) {
return Collections.emptyList();
return false;
}
synchronized (connectionEntry) {
log.debug("{} freezed", addr);
if (connectionEntry.isFreezed()) {
return false;
}
connectionEntry.setFreezed(true);
// only RECONNECT freeze reason could be replaced
if (connectionEntry.getFreezeReason() == null
|| connectionEntry.getFreezeReason() == FreezeReason.RECONNECT) {
@ -134,11 +134,9 @@ public class LoadBalancerManagerImpl implements LoadBalancerManager {
connection.closeAsync();
}
synchronized (connectionEntry) {
List<RedisPubSubConnection> list = new ArrayList<RedisPubSubConnection>(connectionEntry.getAllSubscribeConnections());
connectionEntry.getAllSubscribeConnections().clear();
return list;
}
connectionManager.reattachPubSub(connectionEntry.getAllSubscribeConnections());
connectionEntry.getAllSubscribeConnections().clear();
return true;
}
public Future<RedisPubSubConnection> nextPubSubConnection() {

2
src/main/java/org/redisson/connection/pool/ConnectionPool.java
Unescape Escape View File

@ -277,7 +277,7 @@ abstract class ConnectionPool<T extends RedisConnection> {
private void checkForReconnect(ClientConnectionsEntry entry) {
if (entry.getNodeType() == NodeType.SLAVE) {
connectionManager.slaveDown(masterSlaveEntry, entry.getClient().getAddr().getHostName(),
masterSlaveEntry.slaveDown(entry.getClient().getAddr().getHostName(),
entry.getClient().getAddr().getPort(), FreezeReason.RECONNECT);
log.warn("slave {} disconnected due to failedAttempts={} limit reached", entry.getClient().getAddr(), config.getFailedAttempts());
scheduleCheck(entry);

Write Preview
Loading…
Cancel
Save