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

SOLR-5510 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1546922 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2013-12-02 07:25:58 +00:00
parent 1e42240e89
commit a7f879db76
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1333,30 +1333,31 @@ public final class ZkController {
public void preRegister(CoreDescriptor cd ) { public void preRegister(CoreDescriptor cd ) {
String coreNodeName = getCoreNodeName(cd); String coreNodeName = getCoreNodeName(cd);
// make sure the node name is set on the descriptor
if (cd.getCloudDescriptor().getCoreNodeName() == null) {
cd.getCloudDescriptor().setCoreNodeName(coreNodeName);
}
// before becoming available, make sure we are not live and active // before becoming available, make sure we are not live and active
// this also gets us our assigned shard id if it was not specified // this also gets us our assigned shard id if it was not specified
try { try {
if(cd.getCloudDescriptor().getCollectionName() !=null && cd.getCloudDescriptor().getCoreNodeName() != null ) { CloudDescriptor cloudDesc = cd.getCloudDescriptor();
if(cd.getCloudDescriptor().getCollectionName() !=null && cloudDesc.getCoreNodeName() != null ) {
//we were already registered //we were already registered
if(zkStateReader.getClusterState().hasCollection(cd.getCloudDescriptor().getCollectionName())){ if(zkStateReader.getClusterState().hasCollection(cloudDesc.getCollectionName())){
DocCollection coll = zkStateReader.getClusterState().getCollection(cd.getCloudDescriptor().getCollectionName()); DocCollection coll = zkStateReader.getClusterState().getCollection(cloudDesc.getCollectionName());
if(!"true".equals(coll.getStr("autoCreated"))){ if(!"true".equals(coll.getStr("autoCreated"))){
Slice slice = coll.getSlice(cd.getCloudDescriptor().getShardId()); Slice slice = coll.getSlice(cloudDesc.getShardId());
if(slice != null){ if(slice != null){
if(slice.getReplica(cd.getCloudDescriptor().getCoreNodeName()) == null) { if(slice.getReplica(cloudDesc.getCoreNodeName()) == null) {
log.info("core_removed This core is removed from ZK"); log.info("core_removed This core is removed from ZK");
throw new SolrException(ErrorCode.NOT_FOUND,coreNodeName +" is removed"); throw new SolrException(ErrorCode.NOT_FOUND,cloudDesc.getCoreNodeName() +" is removed");
} }
} }
} }
} }
} }
// make sure the node name is set on the descriptor
if (cloudDesc.getCoreNodeName() == null) {
cloudDesc.setCoreNodeName(coreNodeName);
}
publish(cd, ZkStateReader.DOWN, false); publish(cd, ZkStateReader.DOWN, false);
} catch (KeeperException e) { } catch (KeeperException e) {
log.error("", e); log.error("", e);