honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Previously added logging in TransportRefreshAction caused NPE if search shards had errors (or was not yet started/assigned) 

Better formatting for logging in TransportRefreshAction
This commit is contained in:
Boaz Leskes 2013-09-02 21:53:00 +02:00
parent a48c437ffb
commit 7307e37efe
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
View File

@ -113,7 +113,7 @@ public class TransportRefreshAction extends TransportBroadcastOperationAction<Re
protected ShardRefreshResponse shardOperation(ShardRefreshRequest request) throws ElasticSearchException { protected ShardRefreshResponse shardOperation(ShardRefreshRequest request) throws ElasticSearchException {
IndexShard indexShard = indicesService.indexServiceSafe(request.index()).shardSafe(request.shardId()); IndexShard indexShard = indicesService.indexServiceSafe(request.index()).shardSafe(request.shardId());
indexShard.refresh(new Engine.Refresh().force(request.force())); indexShard.refresh(new Engine.Refresh().force(request.force()));
logger.debug("Refresh request executed for {}. Force: [{}].", indexShard.shardId(), request.force()); logger.debug("{} Refresh request executed. Force: [{}].", indexShard.shardId(), request.force());
return new ShardRefreshResponse(request.index(), request.shardId()); return new ShardRefreshResponse(request.index(), request.shardId());
} }

13
src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
View File

@ -390,13 +390,20 @@ public abstract class TransportSearchTypeAction extends TransportAction<SearchRe
final void innerMoveToSecondPhase() throws Exception { final void innerMoveToSecondPhase() throws Exception {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
boolean hadOne = false;
for (int i = 0; i < firstResults.length(); i++) { for (int i = 0; i < firstResults.length(); i++) {
SearchShardTarget shard = firstResults.get(i).shardTarget(); FirstResult result = firstResults.get(i);
if (i > 0) { if (result == null) {
continue; // failure
}
if (hadOne) {
sb.append(","); sb.append(",");
} else {
hadOne = true;
} }
sb.append(shard); sb.append(result.shardTarget());
} }
logger.debug("Moving to second phase, based on results from: {}", sb); logger.debug("Moving to second phase, based on results from: {}", sb);
} }
moveToSecondPhase(); moveToSecondPhase();