You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/09/17 15:22:48 UTC
[lucene-solr] 14/18: @849 > 10s ParWork, shorter poll.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit e26f1d2aae78c734db38e50c1672cf55d843dc5f
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Sep 16 23:28:48 2020 -0500
@849 > 10s ParWork, shorter poll.
---
solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java | 2 +-
solr/solrj/src/java/org/apache/solr/common/ParWork.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
index 0a6cfbb..4078432 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
@@ -218,7 +218,7 @@ public class OverseerTaskProcessor implements Runnable, Closeable {
if (heads.size() < MAX_BLOCKED_TASKS) {
//instead of reading MAX_PARALLEL_TASKS items always, we should only fetch as much as we can execute
int toFetch = Math.min(MAX_BLOCKED_TASKS - heads.size(), MAX_PARALLEL_TASKS - runningTasksSize());
- List<QueueEvent> newTasks = workQueue.peekTopN(toFetch, excludedTasks, 10000);
+ List<QueueEvent> newTasks = workQueue.peekTopN(toFetch, excludedTasks, 1500);
if (log.isDebugEnabled()) log.debug("Got {} tasks from work-queue : [{}]", newTasks.size(), newTasks);
heads.addAll(newTasks);
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/ParWork.java b/solr/solrj/src/java/org/apache/solr/common/ParWork.java
index 8aa7b67..f45e67e 100644
--- a/solr/solrj/src/java/org/apache/solr/common/ParWork.java
+++ b/solr/solrj/src/java/org/apache/solr/common/ParWork.java
@@ -426,7 +426,7 @@ public class ParWork implements Closeable {
for (Future<Object> future : results) {
try {
future.get(
- Integer.getInteger("solr.parwork.task_timeout", 10000),
+ Integer.getInteger("solr.parwork.task_timeout", 120000),
TimeUnit.MILLISECONDS); // nocommit
if (!future.isDone() || future.isCancelled()) {
log.warn("A task did not finish isDone={} isCanceled={}",