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/03/24 18:13:56 UTC
svn commit: r1580919 - in /lucene/dev/branches/lucene_solr_4_7: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
Author: shalin
Date: Mon Mar 24 17:13:56 2014
New Revision: 1580919
URL: http://svn.apache.org/r1580919
Log:
SOLR-5861: Recovery should not set onlyIfLeaderActive=true for slice in 'recovery' state
Modified:
lucene/dev/branches/lucene_solr_4_7/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_7/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
Modified: lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt?rev=1580919&r1=1580918&r2=1580919&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt Mon Mar 24 17:13:56 2014
@@ -66,6 +66,9 @@ Bug Fixes
* SOLR-5895: JavaBinLoader hides IOExceptions. (Mike Sokolov via shalin)
+* SOLR-5861: Recovery should not set onlyIfLeaderActive=true for slice in 'recovery'
+ state. (shalin)
+
================== 4.7.0 ==================
Versions of Major Components
Modified: lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java?rev=1580919&r1=1580918&r2=1580919&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java Mon Mar 24 17:13:56 2014
@@ -218,7 +218,7 @@ public class RecoveryStrategy extends Th
prepCmd.setState(ZkStateReader.RECOVERING);
prepCmd.setCheckLive(true);
prepCmd.setOnlyIfLeader(true);
- if (!Slice.CONSTRUCTION.equals(slice.getState())) {
+ if (!Slice.CONSTRUCTION.equals(slice.getState()) && !Slice.RECOVERY.equals(slice.getState())) {
prepCmd.setOnlyIfLeaderActive(true);
}
server.request(prepCmd);