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

Ignore numeric shard count if waiting for ALL (#31265) 

Today, if GET /_cluster/health?wait_for_active_shards=all does not immediately
succeed then it throws an exception due to an erroneous and unnecessary call to
ActiveShardCount#enoughShardsActive(). This commit fixes this logic.

Fixes #31151
This commit is contained in:
David Turner 2018-06-13 11:25:26 +01:00 committed by GitHub
parent 5c77ebe89d
commit 489db54e57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
View File

@ -234,11 +234,11 @@ public class TransportClusterHealthAction extends TransportMasterNodeReadAction<
ActiveShardCount waitForActiveShards = request.waitForActiveShards(); ActiveShardCount waitForActiveShards = request.waitForActiveShards();
assert waitForActiveShards.equals(ActiveShardCount.DEFAULT) == false : assert waitForActiveShards.equals(ActiveShardCount.DEFAULT) == false :
"waitForActiveShards must not be DEFAULT on the request object, instead it should be NONE"; "waitForActiveShards must not be DEFAULT on the request object, instead it should be NONE";
if (waitForActiveShards.equals(ActiveShardCount.ALL) if (waitForActiveShards.equals(ActiveShardCount.ALL)) {
&& response.getUnassignedShards() == 0 if (response.getUnassignedShards() == 0 && response.getInitializingShards() == 0) {
&& response.getInitializingShards() == 0) {
// if we are waiting for all shards to be active, then the num of unassigned and num of initializing shards must be 0 // if we are waiting for all shards to be active, then the num of unassigned and num of initializing shards must be 0
waitForCounter++; waitForCounter++;
}
} else if (waitForActiveShards.enoughShardsActive(response.getActiveShards())) { } else if (waitForActiveShards.enoughShardsActive(response.getActiveShards())) {
// there are enough active shards to meet the requirements of the request // there are enough active shards to meet the requirements of the request
waitForCounter++; waitForCounter++;

15
server/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.action.admin.cluster.health; package org.elasticsearch.action.admin.cluster.health;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetaData;
@ -61,6 +62,20 @@ public class TransportClusterHealthActionTests extends ESTestCase {
assertThat(TransportClusterHealthAction.prepareResponse(request, response, clusterState, null), equalTo(0)); assertThat(TransportClusterHealthAction.prepareResponse(request, response, clusterState, null), equalTo(0));
} }
public void testWaitForAllShards() {
final String[] indices = {"test"};
final ClusterHealthRequest request = new ClusterHealthRequest();
request.waitForActiveShards(ActiveShardCount.ALL);
ClusterState clusterState = randomClusterStateWithInitializingShards("test", 1);
ClusterHealthResponse response = new ClusterHealthResponse("", indices, clusterState);
assertThat(TransportClusterHealthAction.prepareResponse(request, response, clusterState, null), equalTo(0));
clusterState = ClusterState.builder(ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY)).build();
response = new ClusterHealthResponse("", indices, clusterState);
assertThat(TransportClusterHealthAction.prepareResponse(request, response, clusterState, null), equalTo(1));
}
ClusterState randomClusterStateWithInitializingShards(String index, final int initializingShards) { ClusterState randomClusterStateWithInitializingShards(String index, final int initializingShards) {
final IndexMetaData indexMetaData = IndexMetaData final IndexMetaData indexMetaData = IndexMetaData
.builder(index) .builder(index)