Fixed - org.redisson.spring.data.connection.RedissonConnectionFactory…

….getSentinelConnection() method throws error on the first offline sentinel #5817
redisson · May 17, 2024 · 4a849af · 4a849af
1 parent 6bfd7c9
commit 4a849af
Show file tree

Hide file tree

Showing 14 changed files with 113 additions and 71 deletions.
diff --git a/...-data-16/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-16/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -107,22 +107,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
-        SentinelConnectionManager manager = ((SentinelConnectionManager)((Redisson)redisson).getConnectionManager());
+
+        SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
 }
diff --git a/...-data-17/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-17/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -119,22 +119,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
+
         SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
 }
diff --git a/...-data-18/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-18/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -126,22 +126,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
+
         SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
 }
diff --git a/...-data-20/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-20/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -125,22 +125,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
-        SentinelConnectionManager manager = ((SentinelConnectionManager)((Redisson)redisson).getConnectionManager());
+
+        SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
     @Override

diff --git a/...-data-21/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-21/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -125,22 +125,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
+
         SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
     @Override

diff --git a/...-data-22/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-22/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -131,22 +131,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
+
         SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
     @Override

diff --git a/...-data-23/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-23/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -131,22 +131,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
-        SentinelConnectionManager manager = ((SentinelConnectionManager)((RedissonKeys)redisson.getKeys()).getConnectionManager());
+
+        SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
     @Override

diff --git a/...-data-24/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-24/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -131,22 +131,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
+
         SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
     @Override

diff --git a/...-data-25/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-25/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -131,22 +131,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
+
         SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
     @Override

diff --git a/...-data-26/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-26/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -131,22 +131,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
+
         SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
     @Override

diff --git a/...-data-27/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-27/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -131,22 +131,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
+
         SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
     @Override

diff --git a/...-data-30/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java b/...-data-30/src/main/java/org/redisson/spring/data/connection/RedissonConnectionFactory.java
@@ -131,22 +131,25 @@ public RedisSentinelConnection getSentinelConnection() {
         if (!redisson.getConfig().isSentinelConfig()) {
             throw new InvalidDataAccessResourceUsageException("Redisson is not in Sentinel mode");
         }
-        
+
         SentinelConnectionManager manager = (SentinelConnectionManager)(((Redisson)redisson).getConnectionManager());
         for (RedisClient client : manager.getSentinels()) {
-            org.redisson.client.RedisConnection connection = client.connect();
+            org.redisson.client.RedisConnection connection = null;
             try {
+                connection = client.connect();
                 String res = connection.sync(RedisCommands.PING);
                 if ("pong".equalsIgnoreCase(res)) {
                     return new RedissonSentinelConnection(connection);
                 }
             } catch (Exception e) {
                 log.warn("Can't connect to " + client, e);
-                connection.closeAsync();
+                if (connection != null) {
+                    connection.closeAsync();
+                }
             }
         }
-        
-        throw new InvalidDataAccessResourceUsageException("Sentinels are not found");
+
+        throw new InvalidDataAccessResourceUsageException("Sentinels are offline");
     }
 
     @Override