Author: catholicon
Date: Wed Aug 14 14:30:30 2019
New Revision: 1865136
URL: http://svn.apache.org/viewvc?rev=1865136&view=rev
Log:
OAK-8542: Test failure:
ConcurrentCopyOnReadDirectoryTest.concurrentPrefetchWithTimeout
This test was added in OAK-8513 and was adding elements to a
non-synchronized list using multiple threads.
Also, removed non-required (and dangling) initialization of thread pool in
setup.
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ConcurrentCopyOnReadDirectoryTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ConcurrentCopyOnReadDirectoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ConcurrentCopyOnReadDirectoryTest.java?rev=1865136&r1=1865135&r2=1865136&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ConcurrentCopyOnReadDirectoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ConcurrentCopyOnReadDirectoryTest.java
Wed Aug 14 14:30:30 2019
@@ -69,7 +69,7 @@ public class ConcurrentCopyOnReadDirecto
private Directory firstCoR = null;
private List<Future<String>> leechingCoRFutures = Lists.newArrayList();
- private List<Directory> leechingCoRs = Lists.newArrayList();
+ private List<Directory> leechingCoRs =
Collections.synchronizedList(Lists.newArrayList());
private CountDownLatch firstCoRBlocker;
private Future<String> firstCoRFutre;
@@ -80,7 +80,6 @@ public class ConcurrentCopyOnReadDirecto
@Before
public void setup() throws Exception {
System.setProperty(WAIT_OTHER_COPY_SYSPROP_NAME,
String.valueOf(TimeUnit.MILLISECONDS.toMillis(30)));
- executorService = Executors.newFixedThreadPool(5);
// normal remote directory
remote = new RAMDirectory() {