Sentinel doesn't support AUTH command. #393

redisson · Feb 4, 2016 · 349f9e9 · 349f9e9
1 parent e81f148
commit 349f9e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/main/java/org/redisson/connection/DefaultConnectionListener.java b/src/main/java/org/redisson/connection/DefaultConnectionListener.java
@@ -31,12 +31,12 @@ public final <T extends RedisConnection> void onConnect(Promise<T> connectionFut
         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) {

diff --git a/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/src/main/java/org/redisson/connection/SentinelConnectionManager.java
@@ -40,14 +40,12 @@
 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 SentinelConnectionManager(SentinelServersConfig cfg, Config config) {
                 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());