GH-3672: Clean up Jdbc & ZK LockRegistry caches
Fixes https://github.com/spring-projects/spring-integration/issues/3672 * Clean up `JdbcLockRegistry`, `ZookeeperLockRegistry` cache automatically * setCapacity(int capacity) to cacheCapacity(int capacity) * field rename `capacity`to `cacheCapacity`, add static
This commit is contained in:
Unseok Kim
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2015-2020 the original author or authors.
|
||||
* Copyright 2015-2021 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -20,9 +20,12 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.fail;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Queue;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.Future;
|
||||
import java.util.concurrent.LinkedBlockingQueue;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.concurrent.locks.Lock;
|
||||
@@ -35,7 +38,8 @@ import org.springframework.messaging.MessagingException;
|
||||
|
||||
/**
|
||||
* @author Gary Russell
|
||||
* @author Artem Bilan\
|
||||
* @author Artem Bilan
|
||||
* @author Unseok Kim
|
||||
*
|
||||
* @since 4.2
|
||||
*
|
||||
@@ -336,4 +340,179 @@ public class ZkLockRegistryTests extends ZookeeperTestSupport {
|
||||
registry.destroy();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void concurrentObtainCapacityTest() throws InterruptedException {
|
||||
final int KEY_CNT = 50;
|
||||
final int CAPACITY_CNT = 17;
|
||||
final int THREAD_CNT = 4;
|
||||
|
||||
final CountDownLatch maincountDownLatch = new CountDownLatch(KEY_CNT);
|
||||
final CountDownLatch countDownLatch = new CountDownLatch(THREAD_CNT);
|
||||
final ZookeeperLockRegistry registry = new ZookeeperLockRegistry(this.client);
|
||||
registry.setCacheCapacity(CAPACITY_CNT);
|
||||
final ExecutorService executorService = Executors.newFixedThreadPool(THREAD_CNT);
|
||||
|
||||
for (int i = 0; i < KEY_CNT; i++) {
|
||||
int finalI = i;
|
||||
executorService.submit(() -> {
|
||||
countDownLatch.countDown();
|
||||
try {
|
||||
countDownLatch.await();
|
||||
}
|
||||
catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
String keyId = "foo:" + finalI;
|
||||
Lock obtain = registry.obtain(keyId);
|
||||
maincountDownLatch.countDown();
|
||||
obtain.lock();
|
||||
obtain.unlock();
|
||||
});
|
||||
}
|
||||
executorService.shutdown();
|
||||
maincountDownLatch.await();
|
||||
executorService.awaitTermination(5, TimeUnit.SECONDS);
|
||||
|
||||
//capacity limit test
|
||||
assertThat(getRegistryLocks(registry)).hasSize(CAPACITY_CNT);
|
||||
|
||||
|
||||
registry.expireUnusedOlderThan(-1000);
|
||||
assertThat(getRegistryLocks(registry)).isEmpty();
|
||||
registry.destroy();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void concurrentObtainRemoveOrderTest() throws InterruptedException {
|
||||
final int THREAD_CNT = 2;
|
||||
final int DUMMY_LOCK_CNT = 3;
|
||||
|
||||
final int CAPACITY_CNT = THREAD_CNT;
|
||||
|
||||
final CountDownLatch countDownLatch = new CountDownLatch(THREAD_CNT);
|
||||
final ZookeeperLockRegistry registry = new ZookeeperLockRegistry(this.client);
|
||||
registry.setCacheCapacity(CAPACITY_CNT);
|
||||
final ExecutorService executorService = Executors.newFixedThreadPool(THREAD_CNT);
|
||||
final Queue<String> remainLockCheckQueue = new LinkedBlockingQueue<>();
|
||||
|
||||
//Removed due to capcity limit
|
||||
for (int i = 0; i < DUMMY_LOCK_CNT; i++) {
|
||||
Lock obtainLock0 = registry.obtain("foo:" + i);
|
||||
obtainLock0.lock();
|
||||
obtainLock0.unlock();
|
||||
}
|
||||
|
||||
for (int i = DUMMY_LOCK_CNT; i < THREAD_CNT + DUMMY_LOCK_CNT; i++) {
|
||||
int finalI = i;
|
||||
executorService.submit(() -> {
|
||||
countDownLatch.countDown();
|
||||
try {
|
||||
countDownLatch.await();
|
||||
}
|
||||
catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
String keyId = "foo:" + finalI;
|
||||
remainLockCheckQueue.offer(toKey(keyId));
|
||||
Lock obtain = registry.obtain(keyId);
|
||||
obtain.lock();
|
||||
obtain.unlock();
|
||||
});
|
||||
}
|
||||
|
||||
executorService.shutdown();
|
||||
executorService.awaitTermination(5, TimeUnit.SECONDS);
|
||||
|
||||
assertThat(getRegistryLocks(registry)).containsKeys(
|
||||
remainLockCheckQueue.toArray(new String[remainLockCheckQueue.size()]));
|
||||
registry.destroy();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void concurrentObtainAccessRemoveOrderTest() throws InterruptedException {
|
||||
final int THREAD_CNT = 2;
|
||||
final int DUMMY_LOCK_CNT = 3;
|
||||
|
||||
final int CAPACITY_CNT = THREAD_CNT + 1;
|
||||
final String REMAIN_DUMMY_LOCK_KEY = "foo:1";
|
||||
|
||||
final CountDownLatch countDownLatch = new CountDownLatch(THREAD_CNT);
|
||||
final ZookeeperLockRegistry registry = new ZookeeperLockRegistry(this.client);
|
||||
registry.setCacheCapacity(CAPACITY_CNT);
|
||||
final ExecutorService executorService = Executors.newFixedThreadPool(THREAD_CNT);
|
||||
final Queue<String> remainLockCheckQueue = new LinkedBlockingQueue<>();
|
||||
|
||||
//Removed due to capcity limit
|
||||
for (int i = 0; i < DUMMY_LOCK_CNT; i++) {
|
||||
Lock obtainLock0 = registry.obtain("foo:" + i);
|
||||
obtainLock0.lock();
|
||||
obtainLock0.unlock();
|
||||
}
|
||||
|
||||
Lock obtainLock0 = registry.obtain(REMAIN_DUMMY_LOCK_KEY);
|
||||
obtainLock0.lock();
|
||||
obtainLock0.unlock();
|
||||
remainLockCheckQueue.offer(toKey(REMAIN_DUMMY_LOCK_KEY));
|
||||
|
||||
for (int i = DUMMY_LOCK_CNT; i < THREAD_CNT + DUMMY_LOCK_CNT; i++) {
|
||||
int finalI = i;
|
||||
executorService.submit(() -> {
|
||||
countDownLatch.countDown();
|
||||
try {
|
||||
countDownLatch.await();
|
||||
}
|
||||
catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
String keyId = "foo:" + finalI;
|
||||
remainLockCheckQueue.offer(toKey(keyId));
|
||||
Lock obtain = registry.obtain(keyId);
|
||||
obtain.lock();
|
||||
obtain.unlock();
|
||||
});
|
||||
}
|
||||
|
||||
executorService.shutdown();
|
||||
executorService.awaitTermination(5, TimeUnit.SECONDS);
|
||||
|
||||
assertThat(getRegistryLocks(registry)).containsKeys(
|
||||
remainLockCheckQueue.toArray(new String[remainLockCheckQueue.size()]));
|
||||
registry.destroy();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setCapacityTest() {
|
||||
final int CAPACITY_CNT = 4;
|
||||
final ZookeeperLockRegistry registry = new ZookeeperLockRegistry(this.client);
|
||||
registry.setCacheCapacity(CAPACITY_CNT);
|
||||
|
||||
registry.obtain("foo:1");
|
||||
registry.obtain("foo:2");
|
||||
registry.obtain("foo:3");
|
||||
|
||||
//capacity 4->3
|
||||
registry.setCacheCapacity(CAPACITY_CNT - 1);
|
||||
|
||||
registry.obtain("foo:4");
|
||||
|
||||
assertThat(getRegistryLocks(registry)).hasSize(3);
|
||||
assertThat(getRegistryLocks(registry)).containsKeys(toKey("foo:2"), toKey("foo:3"), toKey("foo:4"));
|
||||
|
||||
//capacity 3->4
|
||||
registry.setCacheCapacity(CAPACITY_CNT);
|
||||
registry.obtain("foo:5");
|
||||
assertThat(getRegistryLocks(registry)).hasSize(4);
|
||||
assertThat(getRegistryLocks(registry)).containsKeys(toKey("foo:3"), toKey("foo:4"), toKey("foo:5"));
|
||||
registry.destroy();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static Map<String, Lock> getRegistryLocks(ZookeeperLockRegistry registry) {
|
||||
return TestUtils.getPropertyValue(registry, "locks", Map.class);
|
||||
}
|
||||
|
||||
private static String toKey(String path) {
|
||||
final String DEFAULT_ROOT = "/SpringIntegration-LockRegistry";
|
||||
return DEFAULT_ROOT + "/" + path;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user