Author: chetanm
Date: Wed Sep 6 11:18:42 2017
New Revision: 1807469
URL: http://svn.apache.org/viewvc?rev=1807469&view=rev
Log:
OAK-6622 - Configure default core pool size for thread pool used by oak-lucene
Set corePoolSize to maxPoolSize to ensure max upto max threads get used
to process the queue
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java?rev=1807469&r1=1807468&r2=1807469&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
Wed Sep 6 11:18:42 2017
@@ -514,7 +514,7 @@ public class LuceneIndexProviderService
}
- private ExecutorService getExecutorService(){
+ ExecutorService getExecutorService(){
if (executorService == null){
executorService = createExecutor();
}
@@ -522,7 +522,7 @@ public class LuceneIndexProviderService
}
private ExecutorService createExecutor() {
- ThreadPoolExecutor executor = new ThreadPoolExecutor(0, 5, 60L,
TimeUnit.SECONDS,
+ ThreadPoolExecutor executor = new ThreadPoolExecutor(5, 5, 60L,
TimeUnit.SECONDS,
new LinkedBlockingQueue<Runnable>(), new ThreadFactory() {
private final AtomicInteger counter = new AtomicInteger();
private final Thread.UncaughtExceptionHandler handler = new
Thread.UncaughtExceptionHandler() {
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java?rev=1807469&r1=1807468&r2=1807469&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
Wed Sep 6 11:18:42 2017
@@ -281,7 +281,6 @@ public class LuceneIndexProviderServiceT
assertNotNull(editorProvider.getBlobStore());
}
- @Ignore("OAK-6622")
@Test
public void executorPoolBehaviour() throws Exception{
MockOsgi.activate(service, context.bundleContext(),
getDefaultConfig());