From 4a46d40504a045b7918697a96e930f3d93a94e3a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 27 Mar 2019 09:51:27 +0100 Subject: [PATCH] DATAREDIS-953 - Release connection after failed validation only once. We now release a connection after a failed validation only once. Previously, a connection was released twice which caused a failure if the connection was obtained from a pool. Original Pull Request: #445 --- .../lettuce/LettuceConnectionFactory.java | 5 ---- .../LettuceConnectionFactoryUnitTests.java | 25 +++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java index a56d58f81..26a74ccd5 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java @@ -1139,12 +1139,7 @@ public class LettuceConnectionFactory if (!valid) { - if (connection != null) { - connectionProvider.release(connection); - } - log.warn("Validation of shared connection failed. Creating a new connection."); - resetConnection(); this.connection = getNativeConnection(); } diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java index 8bb9bfe4d..f871cdf72 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java @@ -687,6 +687,31 @@ public class LettuceConnectionFactoryUnitTests { verify(syncMock).ping(); } + @Test // DATAREDIS-953 + public void shouldReleaseSharedConnectionOnlyOnce() { + + RedisClusterClient clientMock = mock(RedisClusterClient.class); + StatefulRedisClusterConnection connectionMock = mock(StatefulRedisClusterConnection.class); + when(clientMock.connect(ByteArrayCodec.INSTANCE)).thenReturn(connectionMock); + when(connectionMock.isOpen()).thenReturn(false); + + LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(clusterConfig, + LettuceClientConfiguration.defaultConfiguration()) { + + @Override + protected AbstractRedisClient createClient() { + return clientMock; + } + }; + + connectionFactory.setValidateConnection(true); + connectionFactory.afterPropertiesSet(); + + connectionFactory.getConnection().close(); + + verify(connectionMock).close(); + } + @Test // DATAREDIS-842 public void databaseShouldBeSetCorrectlyOnSentinelClient() {