You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/07/11 02:06:43 UTC
lucene-solr:branch_6x: SOLR-9291: ZkSolrResourceLoader should not
retry fetching resources if the server has been shutdown (cherry picked from
commit 42e1caf)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x da25555ba -> 9d8cc80a7
SOLR-9291: ZkSolrResourceLoader should not retry fetching resources if the server has been shutdown
(cherry picked from commit 42e1caf)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9d8cc80a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9d8cc80a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9d8cc80a
Branch: refs/heads/branch_6x
Commit: 9d8cc80a793268b75d7dd287b9e3e15a8e8632a0
Parents: da25555
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Mon Jul 11 07:35:10 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Mon Jul 11 07:36:30 2016 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../org/apache/solr/cloud/ZkSolrResourceLoader.java | 16 +++++++++-------
.../solr/handler/TestSolrConfigHandlerCloud.java | 2 +-
3 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9d8cc80a/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 56fa3cf..84583f0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -104,6 +104,9 @@ Bug Fixes
* SOLR-9236: AutoAddReplicas will append an extra /tlog to the update log location on replica failover.
(Eungsop Yoo, Mark Miller)
+* SOLR-9291: ZkSolrResourceLoader should not retry fetching resources if the server has been shutdown.
+ (shalin)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9d8cc80a/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java b/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
index 2b60e53..209ca68 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
@@ -96,13 +96,15 @@ public class ZkSolrResourceLoader extends SolrResourceLoader {
}
} catch (KeeperException.SessionExpiredException e) {
exception = e;
- // Retry in case of session expiry
- try {
- Thread.sleep(1000);
- log.debug("Sleeping for 1s before retrying fetching resource=" + resource);
- } catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
- throw new IOException("Could not load resource=" + resource, ie);
+ if (!zkController.getCoreContainer().isShutDown()) {
+ // Retry in case of session expiry
+ try {
+ Thread.sleep(1000);
+ log.debug("Sleeping for 1s before retrying fetching resource=" + resource);
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ throw new IOException("Could not load resource=" + resource, ie);
+ }
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9d8cc80a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
index ab2f467..0dbbe40 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
@@ -48,7 +48,7 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
private void setupHarnesses() {
for (final SolrClient client : clients) {
- RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient)client).getBaseURL());
+ RestTestHarness harness = new RestTestHarness(((HttpSolrClient) client)::getBaseURL);
restTestHarnesses.add(harness);
}
}