You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/10/22 19:19:45 UTC
svn commit: r1633656 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
Author: shalin
Date: Wed Oct 22 17:19:44 2014
New Revision: 1633656
URL: http://svn.apache.org/r1633656
Log:
SOLR-6524: Collections left in recovery state after node restart because recovery sleep time increases exponentially between retries
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=1633656&r1=1633655&r2=1633656&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Wed Oct 22 17:19:44 2014
@@ -226,6 +226,9 @@ Bug Fixes
* SOLR-6573: QueryElevationComponent now works with localParams in the query (janhoy)
+* SOLR-6524: Collections left in recovery state after node restart because recovery sleep time
+ increases exponentially between retries. (Mark Miller, shalin)
+
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=1633656&r1=1633655&r2=1633656&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 Wed Oct 22 17:19:44 2014
@@ -529,8 +529,8 @@ public class RecoveryStrategy extends Th
}
try {
- // start at 1 sec and work up to a couple min
- double loopCount = Math.min(Math.pow(2, retries), 600);
+ // start at 1 sec and work up to a min
+ double loopCount = Math.min(Math.pow(2, retries), 60);
log.info("Wait {} seconds before trying to recover again ({})", loopCount, retries);
for (int i = 0; i < loopCount; i++) {
if (isClosed()) break; // check if someone closed us