You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/01/06 02:05:31 UTC
lucene-solr:master: SOLR-11771: Overseer can never process some last
messages
Repository: lucene-solr
Updated Branches:
refs/heads/master 925733d1e -> b8b00786f
SOLR-11771: Overseer can never process some last messages
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b8b00786
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b8b00786
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b8b00786
Branch: refs/heads/master
Commit: b8b00786f377af30e3572282e89dbbd32fbef742
Parents: 925733d
Author: Cao Manh Dat <da...@apache.org>
Authored: Sat Jan 6 09:05:14 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Sat Jan 6 09:05:14 2018 +0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/cloud/Overseer.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b8b00786/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 221d6ad..3da194b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -86,6 +86,8 @@ Bug Fixes
* SOLR-11555: If the query terms reduce to nothing, filter(clause) produces an NPE whereas
fq=clause does not (Erick Erickson)
+* SOLR-11771: Overseer can never process some last messages (Cao Manh Dat)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b8b00786/solr/core/src/java/org/apache/solr/cloud/Overseer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index 3b9dd28..ee5fb18 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -201,7 +201,7 @@ public class Overseer implements SolrCloseable {
LinkedList<Pair<String, byte[]>> queue = null;
try {
// We do not need to filter any nodes here cause all processed nodes are removed once we flush clusterstate
- queue = new LinkedList<>(stateUpdateQueue.peekElements(1000, Long.MAX_VALUE, (x) -> true));
+ queue = new LinkedList<>(stateUpdateQueue.peekElements(1000, 3000L, (x) -> true));
} catch (KeeperException.SessionExpiredException e) {
log.warn("Solr cannot talk to ZK, exiting Overseer main queue loop", e);
return;