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 2016/02/10 16:29:07 UTC
lucene-solr git commit: SOLR-7281: Improve 'best effort',
we don't want this best effort method to easily throw exceptions.
Repository: lucene-solr
Updated Branches:
refs/heads/master a5accccbf -> 8299b0086
SOLR-7281: Improve 'best effort', we don't want this best effort method to easily throw exceptions.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8299b008
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8299b008
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8299b008
Branch: refs/heads/master
Commit: 8299b00868ef677b3ea1f2b9d5090501c2bdfe14
Parents: a5acccc
Author: markrmiller <ma...@apache.org>
Authored: Wed Feb 10 10:27:43 2016 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 10 10:27:43 2016 -0500
----------------------------------------------------------------------
.../src/java/org/apache/solr/cloud/ZkController.java | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8299b008/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index bfd9e76..e436716 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -2496,18 +2496,11 @@ public final class ZkController {
ZkStateReader.NODE_NAME_PROP, nodeName);
try {
Overseer.getInQueue(getZkClient()).offer(Utils.toJSON(m));
- } catch (KeeperException e) {
- log.info("Could not publish node as down: " + e.getMessage());
- } catch (RuntimeException e) {
- Throwable rootCause = SolrException.getRootCause(e);
- if (rootCause instanceof KeeperException) {
- log.info("Could not publish node as down: " + e.getMessage());
- } else {
- throw e;
- }
} catch (InterruptedException e) {
Thread.interrupted();
- log.info("", e);
- }
+ log.info("Publish node as down was interrupted.");
+ } catch (Exception e) {
+ log.info("Could not publish node as down: " + e.getMessage());
+ }
}
}