You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2015/08/25 18:00:10 UTC
svn commit: r1697707 - in /lucene/dev/trunk/solr: ./
core/src/java/org/apache/solr/cloud/ core/src/java/org/apache/solr/core/
core/src/java/org/apache/solr/handler/
core/src/java/org/apache/solr/handler/component/
Author: markrmiller
Date: Tue Aug 25 16:00:09 2015
New Revision: 1697707
URL: http://svn.apache.org/r1697707
Log:
SOLR-7956: There are interrupts on shutdown in places that can cause ChannelAlreadyClosed exceptions which prevents proper closing of transaction logs.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerProcessor.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/ZkContainer.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1697707&r1=1697706&r2=1697707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Aug 25 16:00:09 2015
@@ -150,6 +150,9 @@ Bug Fixes
* SOLR-7949: Resolve XSS issue in Admin UI stats page (David Chiu via janhoy)
+* SOLR-7956: There are interrupts on shutdown in places that can cause ChannelAlreadyClosed
+ exceptions which prevents proper closing of transaction logs. (Mark Miller)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerProcessor.java?rev=1697707&r1=1697706&r2=1697707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerProcessor.java Tue Aug 25 16:00:09 2015
@@ -298,16 +298,7 @@ public class OverseerProcessor implement
isClosed = true;
if(tpe != null) {
if (!tpe.isShutdown()) {
- tpe.shutdown();
- try {
- tpe.awaitTermination(60, TimeUnit.SECONDS);
- } catch (InterruptedException e) {
- log.warn("Thread interrupted while waiting for OCP threadpool close.");
- Thread.currentThread().interrupt();
- } finally {
- if (!tpe.isShutdown())
- tpe.shutdownNow();
- }
+ ExecutorUtil.shutdownAndAwaitTermination(tpe);
}
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/ZkContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/ZkContainer.java?rev=1697707&r1=1697706&r2=1697707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/ZkContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/ZkContainer.java Tue Aug 25 16:00:09 2015
@@ -247,7 +247,7 @@ public class ZkContainer {
zkServer.stop();
}
} finally {
- ExecutorUtil.shutdownNowAndAwaitTermination(coreZkRegister);
+ ExecutorUtil.shutdownAndAwaitTermination(coreZkRegister);
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java?rev=1697707&r1=1697706&r2=1697707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java Tue Aug 25 16:00:09 2015
@@ -700,7 +700,7 @@ public class SolrConfigHandler extends R
prop, expectedVersion, concurrentTasks.size(), collection));
Thread.currentThread().interrupt();
} finally {
- ExecutorUtil.shutdownNowAndAwaitTermination(parallelExecutor);
+ ExecutorUtil.shutdownAndAwaitTermination(parallelExecutor);
}
log.info("Took {}ms to set the property {} to be of version {} for collection {}",
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java?rev=1697707&r1=1697706&r2=1697707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java Tue Aug 25 16:00:09 2015
@@ -219,7 +219,7 @@ public class HttpShardHandlerFactory ext
@Override
public void close() {
try {
- ExecutorUtil.shutdownNowAndAwaitTermination(commExecutor);
+ ExecutorUtil.shutdownAndAwaitTermination(commExecutor);
} finally {
try {
if (defaultClient != null) {