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 2017/02/22 16:55:44 UTC

lucene-solr:branch_6x: SOLR-10063: CoreContainer shutdown has race condition that can cause a hang on shutdown.

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x b48459a3f -> 16d0ee3a4


SOLR-10063: CoreContainer shutdown has race condition that can cause a hang on shutdown.

# Conflicts:
#	solr/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/16d0ee3a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/16d0ee3a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/16d0ee3a

Branch: refs/heads/branch_6x
Commit: 16d0ee3a4c7476224ec2b93e366b776c0d24d0b1
Parents: b48459a
Author: markrmiller <ma...@apache.org>
Authored: Sat Feb 11 17:08:32 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 11:48:53 2017 -0500

----------------------------------------------------------------------
 solr/CHANGES.txt                                         |  2 ++
 .../src/java/org/apache/solr/core/CoreContainer.java     | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/16d0ee3a/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b3dcf67..57af50a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -128,6 +128,8 @@ Bug Fixes
 
 * SOLR-10020: CoreAdminHandler silently swallows some errors. (Mike Drob via Erick Erickson)
 
+* SOLR-10063: CoreContainer shutdown has race condition that can cause a hang on shutdown. (Mark Miller)
+
 Optimizations
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/16d0ee3a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 12b6d94..c92936c 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -655,7 +655,16 @@ public class CoreContainer {
       }
       if (backgroundCloser != null) { // Doesn't seem right, but tests get in here without initializing the core.
         try {
-          backgroundCloser.join();
+          while (true) {
+            backgroundCloser.join(15000);
+            if (backgroundCloser.isAlive()) {
+              synchronized (solrCores.getModifyLock()) {
+                solrCores.getModifyLock().notifyAll(); // there is a race we have to protect against
+              }
+            } else {
+              break;
+            }
+          }
         } catch (InterruptedException e) {
           Thread.currentThread().interrupt();
           if (log.isDebugEnabled()) {