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

SOLR-7141: RecoveryStrategy: Raise time that we wait for any updates from the leader before they saw the recovery state to have finished. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1668396 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2015-03-22 16:04:46 +00:00
parent 12188a93fa
commit 8edc462ec1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -272,6 +272,9 @@ Bug Fixes
* SOLR-7285: ActionThrottle will not pause if getNanoTime first returns 0.
(Mark Miller, Gregory Chanan)
* SOLR-7141: RecoveryStrategy: Raise time that we wait for any updates from the leader before
they saw the recovery state to have finished. (Mark Miller)
Optimizations
----------------------

6
solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
View File

@ -66,6 +66,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
public class RecoveryStrategy extends Thread implements ClosableThread {
private static final int WAIT_FOR_UPDATES_WITH_STALE_STATE_PAUSE = Integer.getInteger("solr.cloud.wait-for-updates-with-stale-state-pause", 7000);
private static final int MAX_RETRIES = 500;
private static final int STARTING_RECOVERY_DELAY = 5000;
@ -368,9 +369,10 @@ public class RecoveryStrategy extends Thread implements ClosableThread {
// we wait a bit so that any updates on the leader
// that started before they saw recovering state
// are sure to have finished
// are sure to have finished (see SOLR-7141 for
// discussion around current value)
try {
Thread.sleep(2000);
Thread.sleep(WAIT_FOR_UPDATES_WITH_STALE_STATE_PAUSE);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}