svn commit: r1503332 - in /lucene/dev/branches/lucene_solr_4_4: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/cloud/ZkController.java

[sh...@apache.org]

Author: shalin
Date: Mon Jul 15 16:50:02 2013
New Revision: 1503332

URL: http://svn.apache.org/r1503332
Log:
SOLR-4997: Skip log recovery for sub shard leaders only

Modified:
    lucene/dev/branches/lucene_solr_4_4/   (props changed)
    lucene/dev/branches/lucene_solr_4_4/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_4/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/cloud/ZkController.java

Modified: lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1503332&r1=1503331&r2=1503332&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/cloud/ZkController.java Mon Jul 15 16:50:02 2013
@@ -795,7 +795,7 @@ public final class ZkController {
       if (!core.isReloaded() && ulog != null) {
         // disable recovery in case shard is in construction state (for shard splits)
         Slice slice = getClusterState().getSlice(collection, shardId);
-        if (!Slice.CONSTRUCTION.equals(slice.getState()) && !isLeader) {
+        if (!Slice.CONSTRUCTION.equals(slice.getState()) || !isLeader) {
           Future<UpdateLog.RecoveryInfo> recoveryFuture = core.getUpdateHandler()
               .getUpdateLog().recoverFromLog();
           if (recoveryFuture != null) {