From e2c9d178484a640d6350d3a9657ef7547593e10c Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Sat, 27 May 2017 17:32:44 +0300
Subject: [PATCH] SentinelConnectionManager should use AUTH with Sentinel
 servers

---
 redisson/src/main/java/org/redisson/api/NodeType.java       | 2 +-
 .../redisson/connection/MasterSlaveConnectionManager.java   | 6 +++++-
 .../org/redisson/connection/SentinelConnectionManager.java  | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/api/NodeType.java b/redisson/src/main/java/org/redisson/api/NodeType.java
index 50b92390d..436d968c1 100644
--- a/redisson/src/main/java/org/redisson/api/NodeType.java
+++ b/redisson/src/main/java/org/redisson/api/NodeType.java
@@ -17,6 +17,6 @@ package org.redisson.api;
 
 public enum NodeType {
 
-    MASTER, SLAVE
+    MASTER, SLAVE, SENTINEL
 
 }
diff --git a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
index 17bb6460f..ddb46e020 100644
--- a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
@@ -373,9 +373,13 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
               .setSslTruststorePassword(config.getSslTruststorePassword())
               .setSslKeystore(config.getSslKeystore())
               .setSslKeystorePassword(config.getSslKeystorePassword())
-              .setPassword(config.getPassword())
               .setDatabase(config.getDatabase())
               .setClientName(config.getClientName());
+        
+        if (type != NodeType.SENTINEL) {
+            redisConfig.setPassword(config.getPassword());
+        }
+        
         return redisConfig;
     }
 
diff --git a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
index 2cbb7e64e..30bba5b01 100755
--- a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
@@ -71,7 +71,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
         initTimer(this.config);
 
         for (URI addr : cfg.getSentinelAddresses()) {
-            RedisClient client = createClient(NodeType.MASTER, addr, this.config.getConnectTimeout(), this.config.getRetryInterval() * this.config.getRetryAttempts());
+            RedisClient client = createClient(NodeType.SENTINEL, addr, this.config.getConnectTimeout(), this.config.getRetryInterval() * this.config.getRetryAttempts());
             try {
                 RedisConnection connection = client.connect();
                 if (!connection.isActive()) {
@@ -154,7 +154,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
     }
 
     private RFuture<RedisPubSubConnection> registerSentinel(final SentinelServersConfig cfg, final URI addr, final MasterSlaveServersConfig c) {
-        RedisClient client = createClient(NodeType.MASTER, addr, c.getConnectTimeout(), c.getRetryInterval() * c.getRetryAttempts());
+        RedisClient client = createClient(NodeType.SENTINEL, addr, c.getConnectTimeout(), c.getRetryInterval() * c.getRetryAttempts());
         RedisClient oldClient = sentinels.putIfAbsent(addr.getHost() + ":" + addr.getPort(), client);
         if (oldClient != null) {
             return newSucceededFuture(null);