lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject svn commit: r1637881 - in /lucene/dev/branches/branch_5x: ./ 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
Date Mon, 10 Nov 2014 14:57:13 GMT
Author: noble
Date: Mon Nov 10 14:57:13 2014
New Revision: 1637881

URL: http://svn.apache.org/r1637881
Log:
SOLR-6579 SnapPuller Replication blocks clean shutdown of tomcat

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1637881&r1=1637880&r2=1637881&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Mon Nov 10 14:57:13 2014
@@ -243,6 +243,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/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1637881&r1=1637880&r2=1637881&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
(original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
Mon Nov 10 14:57:13 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/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1637881&r1=1637880&r2=1637881&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
(original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Mon Nov 10 14:57:13 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;



Mime
View raw message