Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-988 - Discard transactions when releasing pooled connections.

Browse Source 
We now check on connection release whether a connection is in MULTI state. If so, then we discard (rollback) the transaction to reset the connection to a fresh state.

Original Pull Request: #453
This commit is contained in:
Mark Paluch
2019-06-03 10:51:58 +02:00
committed by Christoph Strobl
parent dfa366d8f7
commit da1de92645
3 changed files with 93 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java
View File

@@ -1281,6 +1281,13 @@ public class LettuceConnection extends AbstractRedisConnection {
public void release(StatefulConnection<?, ?> connection) {
if (connection.isOpen()) {
if (connection instanceof StatefulRedisConnection) {
StatefulRedisConnection<?, ?> redisConnection = (StatefulRedisConnection<?, ?>) connection;
if (redisConnection.isMulti()) {
redisConnection.async().discard();
}
}
pool.returnResource((StatefulConnection<byte[], byte[]>) connection);
} else {
pool.returnBrokenResource((StatefulConnection<byte[], byte[]>) connection);

18
src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java
View File

@@ -17,6 +17,7 @@ package org.springframework.data.redis.connection.lettuce;
import io.lettuce.core.AbstractRedisClient;
import io.lettuce.core.api.StatefulConnection;
import io.lettuce.core.api.StatefulRedisConnection;
import io.lettuce.core.support.AsyncConnectionPoolSupport;
import io.lettuce.core.support.AsyncPool;
import io.lettuce.core.support.BoundedPoolConfig;
@@ -109,7 +110,7 @@ class LettucePoolingConnectionProvider implements LettuceConnectionProvider, Red
}
}
/*
/*
* (non-Javadoc)
* @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#getConnectionAsync(java.lang.Class)
*/
@@ -170,14 +171,27 @@ class LettucePoolingConnectionProvider implements LettuceConnectionProvider, Red
+ " was either previously returned or does not belong to this connection provider");
}
discardIfNecessary(connection);
asyncPool.release(connection).join();
return;
}
discardIfNecessary(connection);
pool.returnObject(connection);
}
/*
private void discardIfNecessary(StatefulConnection<?, ?> connection) {
if (connection instanceof StatefulRedisConnection) {
StatefulRedisConnection<?, ?> redisConnection = (StatefulRedisConnection<?, ?>) connection;
if (redisConnection.isMulti()) {
redisConnection.async().discard();
}
}
}
/*
* (non-Javadoc)
* @see org.springframework.data.redis.connection.lettuce.LettuceConnectionProvider#releaseAsync(io.lettuce.core.api.StatefulConnection)
*/