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 2015/02/26 13:11:44 UTC
svn commit: r1662430 - in /lucene/dev/branches/lucene_solr_4_10: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Author: shalin
Date: Thu Feb 26 12:11:43 2015
New Revision: 1662430
URL: http://svn.apache.org/r1662430
Log:
SOLR-6579: SnapPuller Replication blocks clean shutdown of tomcat
Modified:
lucene/dev/branches/lucene_solr_4_10/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_10/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Modified: lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt?rev=1662430&r1=1662429&r2=1662430&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt Thu Feb 26 12:11:43 2015
@@ -46,6 +46,9 @@ Bug Fixes
* SOLR-6631: DistributedQueue spinning on calling zookeeper getChildren()
(Jessica Cheng Mallet, Mark Miller, Timothy Potter)
+* SOLR-6579: SnapPuller Replication blocks clean shutdown of tomcat
+ (Philip Black-Knight via Noble Paul)
+
================== 4.10.3 ==================
Bug Fixes
Modified: lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1662430&r1=1662429&r2=1662430&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Thu Feb 26 12:11:43 2015
@@ -227,6 +227,7 @@ public class ReplicationHandler extends
doFetch(paramsCopy, false);
}
};
+ puller.setDaemon(false);
puller.start();
if (solrParams.getBool(WAIT, false)) {
puller.join();
Modified: lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1662430&r1=1662429&r2=1662430&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Thu Feb 26 12:11:43 2015
@@ -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;