You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2014/11/10 15:51:55 UTC
svn commit: r1637879 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/ReplicationHandler.java
core/src/java/org/apache/solr/handler/SnapPuller.java
Author: noble
Date: Mon Nov 10 14:51:55 2014
New Revision: 1637879
URL: http://svn.apache.org/r1637879
Log:
SOLR-6579 SnapPuller Replication blocks clean shutdown of tomcat
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1637879&r1=1637878&r2=1637879&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Nov 10 14:51:55 2014
@@ -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
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1637879&r1=1637878&r2=1637879&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Mon Nov 10 14:51:55 2014
@@ -228,6 +228,7 @@ public class ReplicationHandler extends
doFetch(paramsCopy, false);
}
};
+ puller.setDaemon(false);
puller.start();
if (solrParams.getBool(WAIT, false)) {
puller.join();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1637879&r1=1637878&r2=1637879&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Mon Nov 10 14:51:55 2014
@@ -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;