Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-21 01:18:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

SOLR-3180: improve logging

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1423275 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2012-12-18 05:27:14 +00:00
parent cb6d05f463
commit 411bc6375c
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
solr/core/src/java/org/apache/solr/SolrLogFormatter.java
View File

@ -196,12 +196,8 @@ sb.append("(group_name=").append(tg.getName()).append(")");
sb.append(" url="+info.url + " node="+zkController.getNodeName());
}
if(info.coreProps == null) {
info.coreProps = getCoreProps(zkController, core);
}
Map<String, Object> coreProps = getCoreProps(zkController, core);
if(!coreProps.equals(info.coreProps)) {
Map<String, Object> coreProps = getReplicaProps(zkController, core);
if (info.coreProps == null || !coreProps.equals(info.coreProps)) {
info.coreProps = coreProps;
final String corePropsString = "coll:" + core.getCoreDescriptor().getCloudDescriptor().getCollectionName() + " core:" + core.getName() + " props:" + coreProps;
sb.append(" " + info.shortId + "_STATE=" + corePropsString);
@ -261,11 +257,11 @@ sb.append("(group_name=").append(tg.getName()).append(")");
return sb.toString();
}
private Map<String,Object> getCoreProps(ZkController zkController, SolrCore core) {
private Map<String,Object> getReplicaProps(ZkController zkController, SolrCore core) {
final String collection = core.getCoreDescriptor().getCloudDescriptor().getCollectionName();
Replica props = zkController.getClusterState().getReplica(collection, ZkStateReader.getCoreNodeName(zkController.getNodeName(), core.getName()));
if(props!=null) {
return props.getProperties();
Replica replica = zkController.getClusterState().getReplica(collection, ZkStateReader.getCoreNodeName(zkController.getNodeName(), core.getName()));
if(replica!=null) {
return replica.getProperties();
}
return Collections.EMPTY_MAP;
}

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

@ -628,8 +628,8 @@ public final class ZkController {
if (log.isInfoEnabled()) {
log.info("Register shard - core:" + coreName + " address:"
+ baseUrl + " shardId:" + shardId);
log.info("Register replica - core:" + coreName + " address:"
+ baseUrl + " collection:" + cloudDesc.getCollectionName() + " shard:" + shardId);
}
ZkNodeProps leaderProps = new ZkNodeProps(props);