Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

This commit is contained in:
markrmiller 2017-02-10 09:39:36 -05:00
parent 117aea9367
commit 9d8a2faf18
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -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
----------------------

4
solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
View File

@ -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);