svn commit: r1554138 - in /lucene/dev/trunk/solr/core/src: java/org/apache/solr/cloud/ZkController.java test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java

[ma...@apache.org]

Author: markrmiller
Date: Mon Dec 30 04:28:35 2013
New Revision: 1554138

URL: http://svn.apache.org/r1554138
Log:
SOLR-5580: Remove more code that is not legal for determining if a core is new or not.

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.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=1554138&r1=1554137&r2=1554138&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 Mon Dec 30 04:28:35 2013
@@ -1334,21 +1334,7 @@ public final class ZkController {
     // this also gets us our assigned shard id if it was not specified
     try {
       CloudDescriptor cloudDesc = cd.getCloudDescriptor();
-      if(cd.getCloudDescriptor().getCollectionName() !=null && cloudDesc.getCoreNodeName() != null ) {
-        //we were already registered
-        if(zkStateReader.getClusterState().hasCollection(cloudDesc.getCollectionName())){
-        DocCollection coll = zkStateReader.getClusterState().getCollection(cloudDesc.getCollectionName());
-         if(!"true".equals(coll.getStr("autoCreated"))){
-           Slice slice = coll.getSlice(cloudDesc.getShardId());
-           if(slice != null){
-             if(slice.getReplica(cloudDesc.getCoreNodeName()) == null) {
-               log.info("core_removed This core is removed from ZK");
-               throw new SolrException(ErrorCode.NOT_FOUND,cloudDesc.getCoreNodeName() +" is removed");
-             }
-           }
-         }
-        }
-      }
+
 
       // make sure the node name is set on the descriptor
       if (cloudDesc.getCoreNodeName() == null) {

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java?rev=1554138&r1=1554137&r2=1554138&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java Mon Dec 30 04:28:35 2013
@@ -34,7 +34,9 @@ import org.apache.solr.common.params.Map
 import org.apache.solr.common.util.NamedList;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore("Not currently valid see SOLR-5580")
 public class DeleteInactiveReplicaTest extends DeleteReplicaTest{
   private CloudSolrServer client;