From 69049b99fa64cbeff764ea8eb9648d46790df0d3 Mon Sep 17 00:00:00 2001 From: Shalin Shekhar Mangar Date: Mon, 15 Jul 2013 16:47:48 +0000 Subject: [PATCH] SOLR-4997: Skip log recovery for sub shard leaders only git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1503328 13f79535-47bb-0310-9956-ffa450edef68 --- solr/core/src/java/org/apache/solr/cloud/ZkController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java index 2ffc89dd0ac..5210df4d6aa 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java @@ -794,7 +794,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 recoveryFuture = core.getUpdateHandler() .getUpdateLog().recoverFromLog(); if (recoveryFuture != null) {