Sentinel doesn't support AUTH command. #393

pull/395/head
Nikita 9 years ago
parent e81f14818a
commit 349f9e9efb

@ -31,12 +31,12 @@ public class DefaultConnectionListener implements ConnectionInitializer {
listener.executeCommands();
}
protected void doConnect(MasterSlaveServersConfig config, NodeType serverMode, FutureConnectionListener<? extends RedisConnection> connectionListener)
protected void doConnect(MasterSlaveServersConfig config, NodeType nodeType, FutureConnectionListener<? extends RedisConnection> connectionListener)
throws RedisException {
if (config.getPassword() != null) {
connectionListener.addCommand(RedisCommands.AUTH, config.getPassword());
}
if (config.getDatabase() != 0 && serverMode != NodeType.SENTINEL) {
if (config.getDatabase() != 0) {
connectionListener.addCommand(RedisCommands.SELECT, config.getDatabase());
}
if (config.getClientName() != null) {

@ -40,14 +40,12 @@ import org.redisson.client.protocol.RedisCommands;
import org.redisson.client.protocol.pubsub.PubSubType;
import org.redisson.cluster.ClusterSlotRange;
import org.redisson.connection.ClientConnectionsEntry.FreezeReason;
import org.redisson.connection.ClientConnectionsEntry.NodeType;
import org.redisson.misc.URIBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
import io.netty.util.concurrent.Promise;
import io.netty.util.internal.PlatformDependent;
public class SentinelConnectionManager extends MasterSlaveConnectionManager {
@ -72,9 +70,6 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
if (!connection.isActive()) {
continue;
}
Promise<RedisConnection> f = newPromise();
connectListener.onConnect(f, connection, NodeType.SENTINEL, c);
f.syncUninterruptibly();
// TODO async
List<String> master = connection.sync(RedisCommands.SENTINEL_GET_MASTER_ADDR_BY_NAME, cfg.getMasterName());

Loading…
Cancel
Save