You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mk...@apache.org on 2018/05/12 08:38:43 UTC
lucene-solr:branch_7x: SOLR-12307: abandon OverseerTriggerThread on
Zk expiration noiseless
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 29b323605 -> 92b4a935d
SOLR-12307: abandon OverseerTriggerThread on Zk expiration noiseless
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/92b4a935
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/92b4a935
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/92b4a935
Branch: refs/heads/branch_7x
Commit: 92b4a935dc48d58613a158a441b701e09ccc5047
Parents: 29b3236
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Sat May 12 11:37:52 2018 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Sat May 12 11:39:24 2018 +0300
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../solr/cloud/autoscaling/OverseerTriggerThread.java | 12 ++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/92b4a935/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8dc94e0..cd58f3d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -191,6 +191,9 @@ Bug Fixes
* SOLR-12170: JSON Facet API: Terms facet on a date field sometimes failed with an exception complaining
about "Invalid Date String". (yonik)
+* SOLR-12307: exiting OverseerTriggerThread without endless noise in log when Zookeeper session is expired
+ (Mikhail Khludnev)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/92b4a935/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
index ece4c4c..052b4c4 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
@@ -142,8 +142,16 @@ public class OverseerTriggerThread implements Runnable, SolrCloseable {
Thread.currentThread().interrupt();
log.warn("Interrupted", e);
break;
- } catch (IOException | KeeperException e) {
- log.error("A ZK error has occurred", e);
+ }
+ catch (IOException | KeeperException e) {
+ if (e instanceof KeeperException.SessionExpiredException ||
+ (e.getCause()!=null && e.getCause() instanceof KeeperException.SessionExpiredException)) {
+ log.warn("Solr cannot talk to ZK, exiting " +
+ getClass().getSimpleName() + " main queue loop", e);
+ return;
+ } else {
+ log.error("A ZK error has occurred", e);
+ }
}
}