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

GH-2884: RedisUtils improvements

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

- synchronize the map
- only call once per component
This commit is contained in:
Gary Russell
2019-04-05 14:32:55 -04:00
committed by Artem Bilan
parent cff67ccdb4
commit ad7ccb3c9b
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,8 @@ public class RedisMessageStore extends AbstractKeyValueMessageStore implements B
private final RedisTemplate<Object, Object> redisTemplate;
private final boolean unlinkAvailable;
private boolean valueSerializerSet;
/**
@@ -72,6 +74,7 @@ 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
@@ -131,7 +134,7 @@ public class RedisMessageStore extends AbstractKeyValueMessageStore implements B
Assert.notNull(id, "'id' must not be null");
Object removedObject = this.doRetrieve(id);
if (removedObject != null) {
if (RedisUtils.isUnlinkAvailable(this.redisTemplate)) {
if (this.unlinkAvailable) {
this.redisTemplate.unlink(id);
}
else {
@@ -143,7 +146,7 @@ public class RedisMessageStore extends AbstractKeyValueMessageStore implements B
@Override
protected void doRemoveAll(Collection<Object> ids) {
if (RedisUtils.isUnlinkAvailable(this.redisTemplate)) {
if (this.unlinkAvailable) {
this.redisTemplate.unlink(ids);
}
else {

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

@@ -97,6 +97,8 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
private final String registryKey;
private final boolean unlinkAvailable;
private final StringRedisTemplate redisTemplate;
private final RedisScript<Boolean> obtainLockScript;
@@ -138,6 +140,7 @@ 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);
}
/**
@@ -184,6 +187,8 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
private final ReentrantLock localLock = new ReentrantLock();
private final boolean unlinkAvailable = RedisLockRegistry.this.unlinkAvailable;
private volatile long lockedAt;
private RedisLock(String path) {
@@ -329,7 +334,7 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
}
private void removeLockKey() {
if (RedisUtils.isUnlinkAvailable(RedisLockRegistry.this.redisTemplate)) {
if (this.unlinkAvailable) {
RedisLockRegistry.this.redisTemplate.unlink(this.lockKey);
}
else {

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

@@ -16,6 +16,7 @@
package org.springframework.integration.redis.util;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -41,14 +42,14 @@ public final class RedisUtils {
@SuppressWarnings("serial")
private static final Map<RedisOperations<?, ?>, Boolean> unlinkAvailable =
new LinkedHashMap<RedisOperations<?, ?>, Boolean>() {
Collections.synchronizedMap(new LinkedHashMap<RedisOperations<?, ?>, Boolean>() {
@Override
protected boolean removeEldestEntry(Entry<RedisOperations<?, ?>, Boolean> eldest) {
return size() > 100;
}
};
});
/**
* Perform an {@code INFO} command on the provided {@link RedisOperations} to check

20
spring-integration-redis/src/test/java/org/springframework/integration/redis/util/RedisLockRegistryTests.java
View File

@@ -18,8 +18,12 @@ package org.springframework.integration.redis.util;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.willReturn;
import static org.mockito.Mockito.mock;
import java.util.Map;
import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
@@ -35,6 +39,8 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisOperations;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.integration.redis.rules.RedisAvailable;
import org.springframework.integration.redis.rules.RedisAvailableTests;
@@ -429,6 +435,20 @@ public class RedisLockRegistryTests extends RedisAvailableTests {
lock.unlock();
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void ntestUlink() {
RedisOperations ops = mock(RedisOperations.class);
Properties props = new Properties();
willReturn(props).given(ops).execute(any(RedisCallback.class));
props.setProperty("redis_version", "3.0.0");
RedisLockRegistry registry = new RedisLockRegistry(mock(RedisConnectionFactory.class), "foo");
assertThat(TestUtils.getPropertyValue(registry, "ulinkAvailable", Boolean.class)).isFalse();
props.setProperty("redis_version", "4.0.0");
registry = new RedisLockRegistry(mock(RedisConnectionFactory.class), "foo");
assertThat(TestUtils.getPropertyValue(registry, "ulinkAvailable", Boolean.class)).isTrue();
}
private Long getExpire(RedisLockRegistry registry, String lockKey) {
StringRedisTemplate template = createTemplate();
String registryKey = TestUtils.getPropertyValue(registry, "registryKey", String.class);