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/03/24 14:15:24 UTC
svn commit: r1668884 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
Author: markrmiller
Date: Tue Mar 24 13:15:24 2015
New Revision: 1668884
URL: http://svn.apache.org/r1668884
Log:
SOLR-7141: RecoveryStrategy: Raise time that we wait for any updates from the leader before they saw the recovery state to have finished.
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1668884&r1=1668883&r2=1668884&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Tue Mar 24 13:15:24 2015
@@ -220,6 +220,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
----------------------
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java?rev=1668884&r1=1668883&r2=1668884&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java Tue Mar 24 13:15:24 2015
@@ -66,6 +66,7 @@ import java.util.concurrent.ExecutionExc
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 Th
// 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();
}