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

SOLR-5861: Recovery should not set onlyIfLeaderActive=true for slice in 'recovery' state 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1577228 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2014-03-13 16:30:18 +00:00
parent 2aa5585ede
commit 8d64ac3a90
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -163,6 +163,9 @@ Bug Fixes
* SOLR-5800: Admin UI - Analysis form doesn't render results correctly when a * SOLR-5800: Admin UI - Analysis form doesn't render results correctly when a
CharFilter is used. (steffkes) CharFilter is used. (steffkes)
* SOLR-5861: Recovery should not set onlyIfLeaderActive=true for slice in 'recovery'
state. (shalin)
Optimizations Optimizations
---------------------- ----------------------
* SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY * SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY

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

@ -218,7 +218,7 @@ public class RecoveryStrategy extends Thread implements ClosableThread {
prepCmd.setState(ZkStateReader.RECOVERING); prepCmd.setState(ZkStateReader.RECOVERING);
prepCmd.setCheckLive(true); prepCmd.setCheckLive(true);
prepCmd.setOnlyIfLeader(true); prepCmd.setOnlyIfLeader(true);
if (!Slice.CONSTRUCTION.equals(slice.getState())) { if (!Slice.CONSTRUCTION.equals(slice.getState()) && !Slice.RECOVERY.equals(slice.getState())) {
prepCmd.setOnlyIfLeaderActive(true); prepCmd.setOnlyIfLeaderActive(true);
} }
server.request(prepCmd); server.request(prepCmd);