-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix wait_for_no_initializing_shards params (#58379)
- Loading branch information
Showing
2 changed files
with
97 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
...c/test/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthActionTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.rest.action.admin.cluster; | ||
|
|
||
| import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest; | ||
| import org.elasticsearch.action.support.ActiveShardCount; | ||
| import org.elasticsearch.cluster.health.ClusterHealthStatus; | ||
| import org.elasticsearch.common.Priority; | ||
| import org.elasticsearch.common.unit.TimeValue; | ||
| import org.elasticsearch.rest.RestRequest; | ||
| import org.elasticsearch.test.ESTestCase; | ||
| import org.elasticsearch.test.rest.FakeRestRequest; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import static org.hamcrest.Matchers.equalTo; | ||
|
|
||
| public class RestClusterHealthActionTests extends ESTestCase { | ||
|
|
||
| public void testFromRequest() { | ||
| Map<String, String> params = new HashMap<>(); | ||
| String index = "index"; | ||
| boolean local = randomBoolean(); | ||
| String masterTimeout = randomTimeValue(); | ||
| String timeout = randomTimeValue(); | ||
| ClusterHealthStatus waitForStatus = randomFrom(ClusterHealthStatus.values()); | ||
| boolean waitForNoRelocatingShards = randomBoolean(); | ||
| boolean waitForNoInitializingShards = randomBoolean(); | ||
| int waitForActiveShards = randomIntBetween(1, 3); | ||
| String waitForNodes = "node"; | ||
| Priority waitForEvents = randomFrom(Priority.values()); | ||
|
|
||
| params.put("index", index); | ||
| params.put("local", String.valueOf(local)); | ||
| params.put("master_timeout", masterTimeout); | ||
| params.put("timeout", timeout); | ||
| params.put("wait_for_status", waitForStatus.name()); | ||
| if (waitForNoRelocatingShards || randomBoolean()) { | ||
| params.put("wait_for_no_relocating_shards", String.valueOf(waitForNoRelocatingShards)); | ||
| } | ||
| if (waitForNoInitializingShards || randomBoolean()) { | ||
| params.put("wait_for_no_initializing_shards", String.valueOf(waitForNoInitializingShards)); | ||
| } | ||
| params.put("wait_for_active_shards", String.valueOf(waitForActiveShards)); | ||
| params.put("wait_for_nodes", waitForNodes); | ||
| params.put("wait_for_events", waitForEvents.name()); | ||
|
|
||
| FakeRestRequest restRequest = buildRestRequest(params); | ||
| ClusterHealthRequest clusterHealthRequest = RestClusterHealthAction.fromRequest(restRequest); | ||
| assertThat(clusterHealthRequest.indices().length, equalTo(1)); | ||
| assertThat(clusterHealthRequest.indices()[0], equalTo(index)); | ||
| assertThat(clusterHealthRequest.local(), equalTo(local)); | ||
| assertThat(clusterHealthRequest.masterNodeTimeout(), equalTo(TimeValue.parseTimeValue(masterTimeout, "test"))); | ||
| assertThat(clusterHealthRequest.timeout(), equalTo(TimeValue.parseTimeValue(timeout, "test"))); | ||
| assertThat(clusterHealthRequest.waitForStatus(), equalTo(waitForStatus)); | ||
| assertThat(clusterHealthRequest.waitForNoRelocatingShards(), equalTo(waitForNoRelocatingShards)); | ||
| assertThat(clusterHealthRequest.waitForNoInitializingShards(), equalTo(waitForNoInitializingShards)); | ||
| assertThat(clusterHealthRequest.waitForActiveShards(), equalTo(ActiveShardCount.parseString(String.valueOf(waitForActiveShards)))); | ||
| assertThat(clusterHealthRequest.waitForNodes(), equalTo(waitForNodes)); | ||
| assertThat(clusterHealthRequest.waitForEvents(), equalTo(waitForEvents)); | ||
|
|
||
| } | ||
|
|
||
| private FakeRestRequest buildRestRequest(Map<String, String> params) { | ||
| return new FakeRestRequest.Builder(xContentRegistry()) | ||
| .withMethod(RestRequest.Method.GET) | ||
| .withPath("/_cluster/health") | ||
| .withParams(params) | ||
| .build(); | ||
| } | ||
| } |