0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1921 improve thread handling

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-11-29 10:29:52 +09:00
parent 95586d98d4
commit c33f7c242c
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
View file

@ -18,7 +18,8 @@ package org.codelibs.fess.exec;
import java.io.File;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import javax.annotation.Resource;
@ -191,10 +192,14 @@ public class ThumbnailGenerator {
int totalCount = 0;
int count = 1;
final ForkJoinPool pool = new ForkJoinPool(options.numOfThreads);
while (count != 0) {
count = ComponentUtil.getThumbnailManager().generate(pool, options.cleanup);
totalCount += count;
final ExecutorService executorService = Executors.newFixedThreadPool(options.numOfThreads);
try {
while (count != 0) {
count = ComponentUtil.getThumbnailManager().generate(executorService, options.cleanup);
totalCount += count;
}
} finally {
executorService.shutdown();
}
return totalCount;
}

20
src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
View file

@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
@ -191,11 +191,11 @@ public class ThumbnailManager {
thumbnailQueueBhv.batchInsert(list);
}
public int generate(final ForkJoinPool pool, final boolean cleanup) {
public int generate(final ExecutorService executorService, final boolean cleanup) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final List<String> idList = new ArrayList<>();
final ThumbnailQueueBhv thumbnailQueueBhv = ComponentUtil.getComponent(ThumbnailQueueBhv.class);
pool.submit(() -> thumbnailQueueBhv.selectList(cb -> {
thumbnailQueueBhv.selectList(cb -> {
if (StringUtil.isBlank(fessConfig.getSchedulerTargetName())) {
cb.query().setTarget_Equal(Constants.DEFAULT_JOB_TARGET);
} else {
@ -203,16 +203,24 @@ public class ThumbnailManager {
}
cb.query().addOrderBy_CreatedTime_Asc();
cb.fetchFirst(fessConfig.getPageThumbnailQueueMaxFetchSizeAsInteger());
}).parallelStream().forEach(entity -> {
}).stream().map(entity -> {
idList.add(entity.getId());
if (cleanup) {
if (logger.isDebugEnabled()) {
logger.debug("Removing thumbnail queue: " + entity);
}
return null;
} else {
process(fessConfig, entity);
return executorService.submit(() -> process(fessConfig, entity));
}
})).join();
}).filter(f -> f != null).forEach(f -> {
try {
f.get();
} catch (Exception e) {
logger.warn("Failed to process a thumbnail generation.", e);
}
});
if (!idList.isEmpty()) {
thumbnailQueueBhv.queryDelete(cb -> {
cb.query().setId_InScope(idList);