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

SOLR-5580: Remove more code that is not legal for determining if a core is new or not. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1554138 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2013-12-30 04:28:35 +00:00
parent 15fbdbd3a6
commit a59dec83e5
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
solr/core/src/java/org/apache/solr/cloud/ZkController.java
View File

@ -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) {

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

@ -34,7 +34,9 @@ import org.apache.solr.common.params.MapSolrParams;
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;