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

Fixes the active shard count check in the case of (#19760) 

ActiveShardCount.ALL by checking for active shards,
not just started shards, as a shard could be active
but in the relocating state (i.e. not in the started
state).
This commit is contained in:
Ali Beyad 2016-08-02 18:00:39 -04:00 committed by GitHub
parent 22e63b4783
commit c28eee77df
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java
View File

@ -160,12 +160,15 @@ public final class ActiveShardCount implements Writeable {
* to meet the required shard count represented by this instance.
*/
public boolean enoughShardsActive(final IndexShardRoutingTable shardRoutingTable) {
final int activeShardCount = shardRoutingTable.activeShards().size();
if (this == ActiveShardCount.ALL) {
return shardRoutingTable.allShardsStarted();
// adding 1 for the primary in addition to the total number of replicas,
// which gives us the total number of shard copies
return activeShardCount == shardRoutingTable.replicaShards().size() + 1;
} else if (this == ActiveShardCount.DEFAULT) {
return shardRoutingTable.primaryShard().started();
return activeShardCount >= 1;
} else {
return shardRoutingTable.activeShards().size() >= value;
return activeShardCount >= value;
}
}