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

Running the node stats api while a shard is moving onto the node logs an exception 

fixes #4203
This commit is contained in:
Shay Banon 2013-11-19 11:54:09 -08:00
parent a841a422f6
commit bc54201cfc
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java
View File

@ -191,8 +191,7 @@ public class TransportIndicesStatsAction extends TransportBroadcastOperationActi
flags.completionDataFields(request.request.completionFields()); flags.completionDataFields(request.request.completionFields());
} }
ShardStats stats = new ShardStats(indexShard, flags); return new ShardStats(indexShard, flags);
return stats;
} }
public static class IndexShardStatsRequest extends BroadcastShardOperationRequest { public static class IndexShardStatsRequest extends BroadcastShardOperationRequest {

31
src/main/java/org/elasticsearch/indices/InternalIndicesService.java
View File

@ -21,14 +21,12 @@ package org.elasticsearch.indices;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.UnmodifiableIterator; import com.google.common.collect.UnmodifiableIterator;
import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.ElasticSearchIllegalStateException; import org.elasticsearch.ElasticSearchIllegalStateException;
import org.elasticsearch.action.admin.indices.stats.CommonStats; import org.elasticsearch.action.admin.indices.stats.CommonStats;
import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags.Flag; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags.Flag;
import org.elasticsearch.action.admin.indices.stats.ShardStats;
import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.component.AbstractLifecycleComponent;
import org.elasticsearch.common.inject.*; import org.elasticsearch.common.inject.*;
@ -61,6 +59,7 @@ import org.elasticsearch.index.search.stats.SearchStats;
import org.elasticsearch.index.service.IndexService; import org.elasticsearch.index.service.IndexService;
import org.elasticsearch.index.service.InternalIndexService; import org.elasticsearch.index.service.InternalIndexService;
import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.index.settings.IndexSettingsModule;
import org.elasticsearch.index.shard.IllegalIndexShardStateException;
import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.index.shard.service.IndexShard;
import org.elasticsearch.index.similarity.SimilarityModule; import org.elasticsearch.index.similarity.SimilarityModule;
@ -73,7 +72,6 @@ import org.elasticsearch.plugins.IndexPluginsModule;
import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.plugins.PluginsService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
@ -207,33 +205,16 @@ public class InternalIndicesService extends AbstractLifecycleComponent<IndicesSe
for (IndexService indexService : indices.values()) { for (IndexService indexService : indices.values()) {
for (IndexShard indexShard : indexService) { for (IndexShard indexShard : indexService) {
CommonStats indexStas = new CommonStats(indexShard, flags); try {
stats.add(indexStas); stats.add(new CommonStats(indexShard, flags));
} catch (IllegalIndexShardStateException e) {
// we can safely ignore illegal state on ones that are closing for example
}
} }
} }
return new NodeIndicesStats(stats); return new NodeIndicesStats(stats);
} }
public ShardStats[] shardStats(CommonStatsFlags flags) {
// TODO: Do we want to upgrade this to the IndicesService level
List<ShardStats> shardStats = Lists.newArrayList();
for (String index : indices()) {
IndexService indexService = indexService(index);
if (indexService == null) {
continue; // something changed, move along
}
for (int shardId : indexService.shardIds()) {
IndexShard indexShard = indexService.shard(shardId);
if (indexShard == null) {
continue;
}
shardStats.add(new ShardStats(indexShard, flags));
}
}
return shardStats.toArray(new ShardStats[shardStats.size()]);
}
/** /**
* Returns <tt>true</tt> if changes (adding / removing) indices, shards and so on are allowed. * Returns <tt>true</tt> if changes (adding / removing) indices, shards and so on are allowed.
*/ */