#2677 - Fix for trim failing on mutation of lastAccessTime

Currently, lastAccessTime can mutate during cache trim processing. This fixes this issue by taking a copy of the lastAccessTime storing as lastAccessSort and using that for sorting for cache trim.
This commit is contained in:
Rob Bygrave committed 2022-05-02 20:31:10 +12:00
1 parent 7873a2b327
commit d036edf7fd
2 files changed
+15 -11

No files matched your search

@@ -255,7 +255,7 @@ public class DefaultServerCache implements ServerCache {
it.remove(); it.remove();
trimmedByTTL++; trimmedByTTL++;
} else if (trimForMaxSize > 0) { } else if (trimForMaxSize > 0) {
activeList.add(cacheEntry); activeList.add(cacheEntry.forSort());
} }
} }
if (trimForMaxSize > 0 && activeList.size() > maxSize) { if (trimForMaxSize > 0 && activeList.size() > maxSize) {
@@ -293,7 +293,7 @@ public class DefaultServerCache implements ServerCache {
} }
/** /**
* Comparator for sorting by last access time. * Comparator for sorting by last access sort, a copy of last access time that should not mutate during trim processing.
*/ */
public static final class CompareByLastAccess implements Comparator<CacheEntry>, Serializable { public static final class CompareByLastAccess implements Comparator<CacheEntry>, Serializable {
@@ -301,7 +301,7 @@ public class DefaultServerCache implements ServerCache {
@Override @Override
public int compare(CacheEntry e1, CacheEntry e2) { public int compare(CacheEntry e1, CacheEntry e2) {
return Long.compare(e1.getLastAccessTime(), e2.getLastAccessTime()); return Long.compare(e1.lastAccessSort, e2.lastAccessSort);
} }
} }
@@ -314,6 +314,7 @@ public class DefaultServerCache implements ServerCache {
private final Object value; private final Object value;
private final long createTime; private final long createTime;
private long lastAccessTime; private long lastAccessTime;
private long lastAccessSort;
public CacheEntry(Object key, Object value) { public CacheEntry(Object key, Object value) {
this.key = key; this.key = key;
@@ -322,6 +323,14 @@ public class DefaultServerCache implements ServerCache {
this.lastAccessTime = createTime; this.lastAccessTime = createTime;
} }
/**
* Store a copy of lastAccessTime used for sorting. This value should not change during trim processing.
*/
public CacheEntry forSort() {
this.lastAccessSort = lastAccessTime;
return this;
}
/** /**
* Return the entry key. * Return the entry key.
*/ */
@@ -10,13 +10,11 @@ import org.junit.jupiter.api.Test;
import java.util.Random; import java.util.Random;
public class DefaultServerCache_RunEvictionTest { class DefaultServerCache_RunEvictionTest {
private DefaultServerCache createCache() { private DefaultServerCache createCache() {
ServerCacheOptions cacheOptions = new ServerCacheOptions(); ServerCacheOptions cacheOptions = new ServerCacheOptions();
cacheOptions.setMaxSize(10000); cacheOptions.setMaxSize(300);
cacheOptions.setMaxIdleSecs(1); cacheOptions.setMaxIdleSecs(1);
cacheOptions.setMaxSecsToLive(2); cacheOptions.setMaxSecsToLive(2);
cacheOptions.setTrimFrequency(1); cacheOptions.setTrimFrequency(1);
@@ -35,8 +33,7 @@ public class DefaultServerCache_RunEvictionTest {
@Disabled("test takes long time") @Disabled("test takes long time")
@Test @Test
public void runEvict() throws InterruptedException { void runEvict() throws InterruptedException {
for (int i = 0; i < 15; i++) { for (int i = 0; i < 15; i++) {
doStuff(); doStuff();
cache.runEviction(); cache.runEviction();
@@ -47,10 +44,8 @@ public class DefaultServerCache_RunEvictionTest {
} }
private void doStuff() { private void doStuff() {
for (int i = 0; i < 500; i++) { for (int i = 0; i < 500; i++) {
String key = "" + random.nextInt(20000); String key = "" + random.nextInt(20000);
int mode = random.nextInt(10); int mode = random.nextInt(10);
if (mode < 8) { if (mode < 8) {
cache.get(key); cache.get(key);