Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-3721: Fix bug that could allow multiple recoveries to run briefly at the same time if the recovery thread join call was interrupted. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1378904 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2012-08-30 12:19:10 +00:00
parent 883323f166
commit 48ae881287
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/CHANGES.txt
View File

@ -90,6 +90,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
----------------------

12
solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
View File

@ -242,10 +242,14 @@ public final class DefaultSolrCoreState extends SolrCoreState {
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;