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

SOLR-6579 SnapPuller Replication blocks clean shutdown of tomcat 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1637879 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2014-11-10 14:51:55 +00:00
parent 376a4007f6
commit 6ecca6c553
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -272,6 +272,9 @@ Bug Fixes
* SOLR-6706: /update/json/docs throws RuntimeException if a nested structure
contains a non-leaf float field (Noble Paul, shalin)
* SOLR-6579:SnapPuller Replication blocks clean shutdown of tomcat
(Philip Black-Knight via Noble Paul)
Optimizations
----------------------

1
solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
View File

@ -228,6 +228,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
doFetch(paramsCopy, false);
}
};
puller.setDaemon(false);
puller.start();
if (solrParams.getBool(WAIT, false)) {
puller.join();

6
solr/core/src/java/org/apache/solr/handler/SnapPuller.java
View File

@ -508,7 +508,11 @@ public class SnapPuller {
} finally {
try {
if (!successfulInstall) {
logReplicationTimeAndConfFiles(null, successfulInstall);
try {
logReplicationTimeAndConfFiles(null, successfulInstall);
} catch(Exception e) {
LOG.error("caught", e);
}
}
filesToDownload = filesDownloaded = confFilesDownloaded = confFilesToDownload = null;
replicationStartTime = 0;