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 2012/08/30 14:26:28 UTC
svn commit: r1378908 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
Author: markrmiller
Date: Thu Aug 30 12:26:27 2012
New Revision: 1378908
URL: http://svn.apache.org/viewvc?rev=1378908&view=rev
Log:
SOLR-3721: Fix bug that could allow multiple recoveries to run briefly at the same time if the recovery thread join call was interrupted.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1378908&r1=1378907&r2=1378908&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Thu Aug 30 12:26:27 2012
@@ -78,6 +78,10 @@ Bug Fixes
* SOLR-3770: Overseer may lose updates to cluster state (siren)
+* SOLR-3721: Fix bug that could allow multiple recoveries to run briefly at
+ the same time if the recovery thread join call was interrupted.
+ (Per Steffensen, Mark Miller)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java?rev=1378908&r1=1378907&r2=1378908&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java Thu Aug 30 12:26:27 2012
@@ -242,10 +242,14 @@ public final class DefaultSolrCoreState
synchronized (recoveryLock) {
if (recoveryStrat != null) {
recoveryStrat.close();
- try {
- recoveryStrat.join();
- } catch (InterruptedException e) {
-
+ while (true) {
+ try {
+ recoveryStrat.join();
+ } catch (InterruptedException e) {
+ // not interruptible - keep waiting
+ continue;
+ }
+ break;
}
recoveryRunning = false;