You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/02/15 19:00:10 UTC
[06/52] [abbrv] lucene-solr:jira/solr-9858: SOLR-9903: Stop
interrupting the update executor on shutdown,
it can cause graceful shutdowns to put replicas into Leader Initiated Recovery
among other undesirable things.
SOLR-9903: Stop interrupting the update executor on shutdown, it can cause graceful shutdowns to put replicas into Leader Initiated Recovery among other undesirable things.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9d8a2faf
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9d8a2faf
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9d8a2faf
Branch: refs/heads/jira/solr-9858
Commit: 9d8a2faf18640d96f86253888829d04c0c8e7427
Parents: 117aea9
Author: markrmiller <ma...@apache.org>
Authored: Fri Feb 10 09:39:36 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Fri Feb 10 09:40:47 2017 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../core/src/java/org/apache/solr/update/UpdateShardHandler.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9d8a2faf/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7087d28..ccd539f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -136,6 +136,8 @@ New Features
numeric, and conditional evaluators. BooleanOperations have been removed in preference of
BooleanEvaluators. (Dennis Gove)
+* SOLR-9903: Stop interrupting the update executor on shutdown, it can cause graceful shutdowns to put replicas into Leader
+ Initiated Recovery among other undesirable things. (Mark Miller)
Bug Fixes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9d8a2faf/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
index 5affae6..9d4eb7d 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -178,8 +178,8 @@ public class UpdateShardHandler implements SolrMetricProducer, SolrInfoMBean {
public void close() {
try {
- // we interrupt on purpose here, but this executor should not run threads that do disk IO!
- ExecutorUtil.shutdownWithInterruptAndAwaitTermination(updateExecutor);
+ // do not interrupt, do not interrupt
+ ExecutorUtil.shutdownAndAwaitTermination(updateExecutor);
ExecutorUtil.shutdownAndAwaitTermination(recoveryExecutor);
} catch (Exception e) {
SolrException.log(log, e);