Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

REST high-level client: add Cluster Health API #29331

Merged
merged 22 commits into from
Jun 12, 2018
Merged

REST high-level client: add Cluster Health API #29331

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
27d4ce2
Update NOTICE to 2018
Van0SS Apr 2, 2018
d177736
REST high-level client: add Cluster Health API
Van0SS Apr 2, 2018
18dfa6e
Round 2
Van0SS Apr 5, 2018
af3ba59
Merge remote-tracking branch 'origin/master' into enhancement/rest_hl…
Van0SS Apr 10, 2018
67eb608
Round 3
Van0SS Apr 11, 2018
4f0c01e
Revert "Move health calculation logic from constructors to HealthAction"
Van0SS May 29, 2018
5a6ed00
Round 4
Van0SS May 29, 2018
31f587d
Merge branch 'master' of https://github.com/elastic/elasticsearch int…
Van0SS May 30, 2018
d4486ab
Fix tests after moving to 1 shard by default
Van0SS Jun 1, 2018
bd24a05
small update
javanna Jun 6, 2018
573990d
Merge branch 'master' into pr/29331
javanna Jun 6, 2018
8030867
docs update
javanna Jun 6, 2018
27cbf80
adjust compile after merge
javanna Jun 6, 2018
31b5bee
update docs
javanna Jun 6, 2018
a529058
update docs test
javanna Jun 6, 2018
2f6f640
Merge branch 'master' into enhancement/rest_hl_client_cluster_health
javanna Jun 6, 2018
00a848f
Merge branch 'master' into enhancement/rest_hl_client_cluster_health
javanna Jun 6, 2018
33d9692
Merge branch 'master' into enhancement/rest_hl_client_cluster_health
javanna Jun 8, 2018
27c90a8
fix compile error
javanna Jun 8, 2018
f4c8b3f
address review comments
javanna Jun 11, 2018
4921335
Merge branch 'master' into enhancement/rest_hl_client_cluster_health
javanna Jun 11, 2018
982dd98
Merge branch 'master' into enhancement/rest_hl_client_cluster_health
javanna Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Elasticsearch
Copyright 2009-2017 Elasticsearch
Copyright 2009-2018 Elasticsearch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please could you revert this? This change should not be made as part of this PR, regardless of whether it's needed or not.


This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
24 changes: 24 additions & 0 deletions client/rest-high-level/src/main/java/org/elasticsearch/client/ClusterClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

import org.apache.http.Header;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse;

Expand Down Expand Up @@ -63,4 +65,26 @@ public void putSettingsAsync(ClusterUpdateSettingsRequest clusterUpdateSettingsR
restHighLevelClient.performRequestAsyncAndParseEntity(clusterUpdateSettingsRequest, Request::clusterPutSettings,
ClusterUpdateSettingsResponse::fromXContent, listener, emptySet(), headers);
}

/**
* Get cluster health using the Cluster Health API
* <p>
* See
* <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html"> Cluster Health API on elastic.co</a>
*/
public ClusterHealthResponse health(ClusterHealthRequest healthRequest, Header... headers) throws IOException {
return restHighLevelClient.performRequestAndParseEntity(healthRequest, Request::clusterHealth, ClusterHealthResponse::fromXContent,
emptySet(), headers);
}

/**
* Asynchronously get cluster health using the Cluster Health API
* <p>
* See
* <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html"> Cluster Health API on elastic.co</a>
*/
public void healthAsync(ClusterHealthRequest healthRequest, ActionListener<ClusterHealthResponse> listener, Header... headers) {
restHighLevelClient.performRequestAsyncAndParseEntity(healthRequest, Request::clusterHealth, ClusterHealthResponse::fromXContent,
listener, emptySet(), headers);
}
}
43 changes: 43 additions & 0 deletions client/rest-high-level/src/main/java/org/elasticsearch/client/Request.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.http.entity.ContentType;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
Expand Down Expand Up @@ -58,6 +59,7 @@
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.support.WriteRequest;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.cluster.health.ClusterHealthStatus;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.SuppressForbidden;
Expand Down Expand Up @@ -583,6 +585,22 @@ static Request clusterPutSettings(ClusterUpdateSettingsRequest clusterUpdateSett
return new Request(HttpPut.METHOD_NAME, "/_cluster/settings", parameters.getParams(), entity);
}

static Request clusterHealth(ClusterHealthRequest healthRequest) {
Params params = Params.builder();
params.withWaitForStatus(healthRequest.waitForStatus());
params.withWaitForNoRelocatingShards(healthRequest.waitForNoRelocatingShards());
params.withWaitForNoInitializingShards(healthRequest.waitForNoInitializingShards());
params.withWaitForActiveShards(healthRequest.waitForActiveShards());
params.withWaitForNodes(healthRequest.waitForNodes());
params.withTimeout(healthRequest.timeout());
params.withMasterTimeout(healthRequest.masterNodeTimeout());
params.withLocal(healthRequest.local());
params.putParam("level", "shards");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Right now you request the whole thing because it is simpler that way. I think this is fine. I think if we decide we'd like to support level as something else then we can do it in a followup. What do you think, @javanna?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had missed this line, so my comment on this is a bit off, sorry about that :) this is actually perfectly backwards compatible with the transport client behaviour, as it gets exactly everything. I think that we could add the level parameter though so that we can properly filter what gets returned at REST like every client works.

String[] indices = healthRequest.indices() == null ? Strings.EMPTY_ARRAY : healthRequest.indices();
String endpoint = endpoint(indices, "_cluster/health");
return new Request(HttpGet.METHOD_NAME, endpoint, params.getParams(), null);
}

static Request rollover(RolloverRequest rolloverRequest) throws IOException {
Params params = Params.builder();
params.withTimeout(rolloverRequest.timeout());
Expand Down Expand Up @@ -833,6 +851,31 @@ Params withIncludeDefaults(boolean includeDefaults) {
return this;
}

Params withWaitForStatus(ClusterHealthStatus status) {
if (status != null) {
return putParam("wait_for_status", status.name().toLowerCase(Locale.ROOT));
}
return this;
}

Params withWaitForNoRelocatingShards(boolean waitNoRelocatingShards) {
if (waitNoRelocatingShards) {
return putParam("wait_for_no_relocating_shards", Boolean.TRUE.toString());
}
return this;
}

Params withWaitForNoInitializingShards(boolean waitNoInitShards) {
if (waitNoInitShards) {
return putParam("wait_for_no_initializing_shards", Boolean.TRUE.toString());
}
return this;
}

Params withWaitForNodes(String waitForNodes) {
return putParam("wait_for_nodes", waitForNodes);
}

Map<String, String> getParams() {
return Collections.unmodifiableMap(params);
}
Expand Down
22 changes: 22 additions & 0 deletions client/rest-high-level/src/test/java/org/elasticsearch/client/ClusterClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@
package org.elasticsearch.client;

import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse;
import org.elasticsearch.cluster.health.ClusterHealthStatus;
import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
Expand All @@ -34,8 +37,10 @@
import java.util.HashMap;
import java.util.Map;

import static java.util.Collections.emptyMap;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;

Expand Down Expand Up @@ -105,4 +110,21 @@ public void testClusterUpdateSettingNonExistent() {
assertThat(exception.getMessage(), equalTo(
"Elasticsearch exception [type=illegal_argument_exception, reason=transient setting [" + setting + "], not recognized]"));
}

public void testClusterHealth() throws IOException {
ClusterHealthRequest request = new ClusterHealthRequest();
ClusterHealthResponse response = execute(request, highLevelClient().cluster()::health, highLevelClient().cluster()::healthAsync);

assertThat(response, notNullValue());
assertThat(response.isTimedOut(), is(false));
assertThat(response.status(), is(RestStatus.OK));
assertThat(response.getStatus(), is(ClusterHealthStatus.GREEN));
assertThat(response.getIndices(), is(emptyMap()));
assertThat(response.getActivePrimaryShards(), is(0));
assertThat(response.getActiveShards(), is(0));
assertThat(response.getDelayedUnassignedShards(), is(0));
assertThat(response.getInitializingShards(), is(0));
assertThat(response.getUnassignedShards(), is(0));
assertThat(response.getActiveShardsPercent(), is(100d));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should probably add a test that provides indices and the level parameter

}
}
22 changes: 22 additions & 0 deletions client/rest-high-level/src/test/java/org/elasticsearch/client/RequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.http.util.EntityUtils;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
Expand Down Expand Up @@ -127,6 +128,8 @@
import static org.elasticsearch.search.RandomSearchRequestGenerator.randomSearchRequest;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;

public class RequestTests extends ESTestCase {
Expand Down Expand Up @@ -1325,6 +1328,25 @@ public void testClusterPutSettings() throws IOException {
assertEquals(expectedParams, expectedRequest.getParameters());
}

public void testClusterHealth() {
ClusterHealthRequest healthRequest = new ClusterHealthRequest();
Map<String, String> expectedParams = new HashMap<>();
setRandomLocal(healthRequest, expectedParams);
setRandomTimeout(healthRequest::timeout, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, expectedParams);
setRandomMasterTimeout(healthRequest, expectedParams);
expectedParams.put("level", "shards");
// Default value in ClusterHealthRequest is NONE but in Request.Params::withWaitForActiveShards is DEFAULT
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, you may have to make changes here like we already did in the 6.x branch where we have a different default for some API.

Copy link
Contributor Author

@Van0SS Van0SS Apr 3, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please clarify it? If I set in ClusterHealthRequest field waitForActiveShards = ActiveShardCount.DEFAULT then it will fail in TransportClusterHealthAction::prepareResponse

assert waitForActiveShards.equals(ActiveShardCount.DEFAULT) == false :
    "waitForActiveShards must not be DEFAULT on the request object, instead it should be NONE";

Probably it can instead of failing set it to 0.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean to adapt the test, doing something along these lines (from the 6.x branch): https://github.com/elastic/elasticsearch/blob/6.x/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestTests.java#L1649 .

expectedParams.put("wait_for_active_shards", "0");
//TODO add random filling for other properties
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++


Request request = Request.clusterHealth(healthRequest);
assertThat(request, is(notNullValue()));
assertThat(request.getMethod(), is(HttpGet.METHOD_NAME));
assertThat(request.getEntity(), is(nullValue()));
assertThat(request.getEndpoint(), is("/_cluster/health"));
assertThat(request.getParameters(), is(expectedParams));
}

public void testRollover() throws IOException {
RolloverRequest rolloverRequest = new RolloverRequest(randomAlphaOfLengthBetween(3, 10),
randomBoolean() ? null : randomAlphaOfLengthBetween(3, 10));
Expand Down
Loading