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

GH-3041: Deprecate RedisUtils.isUnlinkAvailable()

Browse Source 
Fixes https://github.com/spring-projects/spring-integration/issues/3041

Some Redis clients/servers don't allow to perform an `INFO` command,
therefore we are not able to determine if we can perform `UNLINK` or
not.

* Deprecate `RedisUtils.isUnlinkAvailable()` as not reliable source of
through; use trial with fallback algorithm in the target logic around
`UNLINK` command calls.

**Cherry-pick to 5.1.x**
This commit is contained in:
Artem Bilan
2019-08-30 12:27:44 -04:00
committed by Gary Russell
parent 554f2233f5
commit 3dc0fb5980
3 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java
View File

@@ -26,7 +26,6 @@ import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.SerializationException;
import org.springframework.data.redis.serializer.StringRedisSerializer;
import org.springframework.integration.redis.util.RedisUtils;
import org.springframework.integration.store.AbstractKeyValueMessageStore;
import org.springframework.util.Assert;
@@ -47,10 +46,10 @@ public class RedisMessageStore extends AbstractKeyValueMessageStore implements B
private final RedisTemplate<Object, Object> redisTemplate;
private final boolean unlinkAvailable;
private boolean valueSerializerSet;
private volatile boolean unlinkAvailable = true;
/**
* Construct {@link RedisMessageStore} based on the provided
* {@link RedisConnectionFactory} and default empty prefix.
@@ -76,7 +75,6 @@ public class RedisMessageStore extends AbstractKeyValueMessageStore implements B
this.redisTemplate.setKeySerializer(new StringRedisSerializer());
this.redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
this.redisTemplate.afterPropertiesSet();
this.unlinkAvailable = RedisUtils.isUnlinkAvailable(this.redisTemplate);
}
@Override
@@ -137,7 +135,15 @@ public class RedisMessageStore extends AbstractKeyValueMessageStore implements B
Object removedObject = this.doRetrieve(id);
if (removedObject != null) {
if (this.unlinkAvailable) {
this.redisTemplate.unlink(id);
try {
this.redisTemplate.unlink(id);
}
catch (Exception ex) {
logger.warn("The UNLINK command has failed (not supported on the Redis server?); " +
"falling back to the regular DELETE command", ex);
this.unlinkAvailable = false;
this.redisTemplate.delete(id);
}
}
else {
this.redisTemplate.delete(id);
@@ -149,7 +155,15 @@ public class RedisMessageStore extends AbstractKeyValueMessageStore implements B
@Override
protected void doRemoveAll(Collection<Object> ids) {
if (this.unlinkAvailable) {
this.redisTemplate.unlink(ids);
try {
this.redisTemplate.unlink(ids);
}
catch (Exception ex) {
logger.warn("The UNLINK command has failed (not supported on the Redis server?); " +
"falling back to the regular DELETE command", ex);
this.unlinkAvailable = false;
this.redisTemplate.delete(ids);
}
}
else {
this.redisTemplate.delete(ids);

23
spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
View File

@@ -75,7 +75,7 @@ import org.springframework.util.ReflectionUtils;
*/
public final class RedisLockRegistry implements ExpirableLockRegistry, DisposableBean {
private static final Log logger = LogFactory.getLog(RedisLockRegistry.class);
private static final Log LOGGER = LogFactory.getLog(RedisLockRegistry.class);
private static final long DEFAULT_EXPIRE_AFTER = 60000L;
@@ -97,8 +97,6 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
private final String registryKey;
private final boolean unlinkAvailable;
private final StringRedisTemplate redisTemplate;
private final RedisScript<Boolean> obtainLockScript;
@@ -106,7 +104,7 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
private final long expireAfter;
/**
* An {@link ExecutorService} to call {@link StringRedisTemplate#delete(Object)} in
* An {@link ExecutorService} to call {@link StringRedisTemplate#delete} in
* the separate thread when the current one is interrupted.
*/
private Executor executor =
@@ -140,7 +138,6 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
this.obtainLockScript = new DefaultRedisScript<>(OBTAIN_LOCK_SCRIPT, Boolean.class);
this.registryKey = registryKey;
this.expireAfter = expireAfter;
this.unlinkAvailable = RedisUtils.isUnlinkAvailable(this.redisTemplate);
}
/**
@@ -187,7 +184,7 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
private final ReentrantLock localLock = new ReentrantLock();
private final boolean unlinkAvailable = RedisLockRegistry.this.unlinkAvailable;
private volatile boolean unlinkAvailable = true;
private volatile long lockedAt;
@@ -321,8 +318,8 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
removeLockKey();
}
if (logger.isDebugEnabled()) {
logger.debug("Released lock; " + this);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Released lock; " + this);
}
}
catch (Exception e) {
@@ -335,7 +332,15 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
private void removeLockKey() {
if (this.unlinkAvailable) {
RedisLockRegistry.this.redisTemplate.unlink(this.lockKey);
try {
RedisLockRegistry.this.redisTemplate.unlink(this.lockKey);
}
catch (Exception ex) {
LOGGER.warn("The UNLINK command has failed (not supported on the Redis server?); " +
"falling back to the regular DELETE command", ex);
this.unlinkAvailable = false;
RedisLockRegistry.this.redisTemplate.delete(this.lockKey);
}
}
else {
RedisLockRegistry.this.redisTemplate.delete(this.lockKey);

4
spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisUtils.java
View File

@@ -57,7 +57,11 @@ public final class RedisUtils {
* @param redisOperations the {@link RedisOperations} to perform {@code INFO} command.
* @return true or false if {@code UNLINK} Redis command is available or not.
* @throws IllegalStateException when {@code INFO} returns null from the Redis.
* @deprecated since 5.1.8 in favor of explicit trials in the target code.
* The INFO command might not be available on the server, but UNLINK might.
* Will be removed in version 5.3.
*/
@Deprecated
public static boolean isUnlinkAvailable(RedisOperations<?, ?> redisOperations) {
return unlinkAvailable.computeIfAbsent(redisOperations, key -> {
Properties info = redisOperations.execute(