Skip to content

Commit

Permalink
Speedup computing cluster health (#78969)
Browse files Browse the repository at this point in the history
In cases the status is not GREEN.

Instead of building a list of all shard routings and
then counting the total and active number of shards,
use the RoutingNodes (which should already be built)
that can compute these numbers almost for free.

Relates to #77466
  • Loading branch information
martijnvg authored Oct 12, 2021
1 parent 9b119b1 commit 79542a9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.routing.IndexRoutingTable;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.cluster.routing.RoutingNodes;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
Expand All @@ -20,7 +20,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;

Expand Down Expand Up @@ -104,13 +103,9 @@ public ClusterStateHealth(final ClusterState clusterState, final String[] concre
if (computeStatus.equals(ClusterHealthStatus.GREEN)) {
this.activeShardsPercent = 100;
} else {
List<ShardRouting> shardRoutings = clusterState.getRoutingTable().allShards();
int activeShardCount = 0;
int totalShardCount = 0;
for (ShardRouting shardRouting : shardRoutings) {
if (shardRouting.active()) activeShardCount++;
totalShardCount++;
}
RoutingNodes routingNodes = clusterState.getRoutingNodes();
int activeShardCount = routingNodes.getActiveShardCount();
int totalShardCount = routingNodes.getTotalShardCount();
this.activeShardsPercent = (((double) activeShardCount) / totalShardCount) * 100;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ public class RoutingNodes implements Iterable<RoutingNode> {

private int relocatingShards = 0;

private int activeShardCount = 0;

private int totalShardCount = 0;

private final Map<String, Set<String>> attributeValuesByAttribute = new HashMap<>();
private final Map<String, Recoveries> recoveriesPerNode = new HashMap<>();

Expand All @@ -95,6 +99,7 @@ public RoutingNodes(ClusterState clusterState, boolean readOnly) {
for (IndexShardRoutingTable indexShard : indexRoutingTable) {
assert indexShard.primary != null;
for (ShardRouting shard : indexShard) {
totalShardCount++;
// to get all the shards belonging to an index, including the replicas,
// we define a replica set and keep track of it. A replica set is identified
// by the ShardId, as this is common for primary and replicas.
Expand All @@ -107,6 +112,9 @@ public RoutingNodes(ClusterState clusterState, boolean readOnly) {
throw new IllegalArgumentException("Cannot have two different shards with same shard id on same node");
}
assignedShardsAdd(shard);
if (shard.active()) {
activeShardCount++;
}
if (shard.relocating()) {
relocatingShards++;
// LinkedHashMap to preserve order.
Expand Down Expand Up @@ -273,6 +281,14 @@ public int getRelocatingShardCount() {
return relocatingShards;
}

public int getActiveShardCount() {
return activeShardCount;
}

public int getTotalShardCount() {
return totalShardCount;
}

/**
* Returns all shards that are not in the state UNASSIGNED with the same shard
* ID as the given shard.
Expand Down

0 comments on commit 79542a9

Please sign in to comment.