svn commit: r1466506 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java

[sh...@apache.org]

Author: shalin
Date: Wed Apr 10 15:08:39 2013
New Revision: 1466506

URL: http://svn.apache.org/r1466506
Log:
SOLR-3755: Set update log to buffer before core is published

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1466506&r1=1466505&r2=1466506&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java Wed Apr 10 15:08:39 2013
@@ -1279,6 +1279,10 @@ public final class ZkController {
 
   public void preRegister(SolrCore core) throws KeeperException, InterruptedException {
     CoreDescriptor cd = core.getCoreDescriptor();
+    if (Slice.CONSTRUCTION.equals(cd.getCloudDescriptor().getShardState())) {
+      // set update log to buffer before publishing the core
+      core.getUpdateHandler().getUpdateLog().bufferUpdates();
+    }
     // before becoming available, make sure we are not live and active
     // this also gets us our assigned shard id if it was not specified
     publish(cd, ZkStateReader.DOWN, false);
@@ -1286,7 +1290,6 @@ public final class ZkController {
     if (Slice.CONSTRUCTION.equals(cd.getCloudDescriptor().getShardState())) {
       cd.getCloudDescriptor().setShardState(null);
       cd.getCloudDescriptor().setShardRange(null);
-      core.getUpdateHandler().getUpdateLog().bufferUpdates();
     }
     String coreNodeName = getCoreNodeName(cd);