Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-10141: Upgrade to Caffeine 2.4.0 to fix issues with removal listener

This commit is contained in:
yonik 2017-02-21 17:14:02 -05:00
parent 2d03aa21a2
commit e9e02a2313
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/ivy-versions.properties
View File

@ -22,7 +22,7 @@ com.fasterxml.jackson.core.version = 2.5.4
/com.fasterxml.jackson.core/jackson-databind = ${com.fasterxml.jackson.core.version}
/com.fasterxml.jackson.dataformat/jackson-dataformat-smile = ${com.fasterxml.jackson.core.version}
/com.github.ben-manes.caffeine/caffeine = 2.3.5
/com.github.ben-manes.caffeine/caffeine = 2.4.0
/com.google.guava/guava = 14.0.1

2
solr/CHANGES.txt
View File

@ -154,7 +154,7 @@ Bug Fixes
* SOLR-10121: Fix race conditions in HDFS BlockCache that can contribute to corruption in high
concurrency situations. (yonik)
* SOLR-10141: Upgrade to Caffeine 2.3.5 since v1.0.1 contributed to BlockCache corruption because the
* SOLR-10141: Upgrade to Caffeine 2.4.0 since v1.0.1 contributed to BlockCache corruption because the
removal listener was called more than once for some items and not at all for other items. (Ben Manes, yonik)
* SOLR-9846: Overseer is not always closed after being started. (Mark Miller)

4
solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java
View File

@ -227,15 +227,15 @@ public class BlockCacheTest extends LuceneTestCase {
// Sanity test the underlying concurrent map that BlockCache is using, in the same way that we use it.
@Test
@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-10141")
public void testCacheConcurrent() throws Exception {
Random rnd = random();
// TODO: introduce more randomness in cache size, hit rate, etc
final int blocksInTest = 400;
final int maxEntries = blocksInTest/2;
final int nThreads=64;
final int nReads=10000000;
final int nReads=1000000;
final int readsPerThread=nReads/nThreads;
final int readLastBlockOdds=10; // odds (1 in N) of the next block operation being on the same block as the previous operation... helps flush concurrency issues
final boolean updateAnyway = true; // sometimes insert a new entry for the key even if one was found

1
solr/licenses/caffeine-2.3.5.jar.sha1
View File

@ -1 +0,0 @@
672d74bd3fb0611f671ea4bf65e278c8a5d4af3c

1
solr/licenses/caffeine-2.4.0.jar.sha1 Normal file
View File

@ -0,0 +1 @@
5aa8bbb851b1ad403cc140094ba4a25998369efe