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/07/28 03:59:21 UTC
[lucene-solr] branch reference_impl_dev updated (c141347 -> 1aef83f)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
discard c141347 @416 Fix replay executor.
new 1aef83f @416 Fix replay executor.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c141347)
\
N -- N -- N refs/heads/reference_impl_dev (1aef83f)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/java/org/apache/solr/cloud/OverseerTaskProcessor.java | 2 +-
.../src/test/org/apache/solr/util/OrderedExecutorTest.java | 10 ++++------
solr/solrj/src/java/org/apache/solr/common/ParWork.java | 5 ++---
.../solrj/src/java/org/apache/solr/common/ParWorkExecutor.java | 8 ++------
4 files changed, 9 insertions(+), 16 deletions(-)
[lucene-solr] 01/01: @416 Fix replay executor.
Posted by ma...@apache.org.
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 1aef83f4328d23755d12f07b4e27a1a04551c940
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Jul 27 22:58:49 2020 -0500
@416 Fix replay executor.
---
solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 915da7a..00db828 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
@@ -209,7 +209,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, 2500);
log.debug("Got {} tasks from work-queue : [{}]", newTasks.size(), newTasks);
heads.addAll(newTasks);
}