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

Handle exceptions when building _cat/indices response

This commit is contained in:
Dan Hermann 2020-05-25 09:59:24 -05:00 committed by GitHub
parent dde75b0f64
commit c5f61fe24c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml
View File

@ -273,3 +273,19 @@
open \s+ foo\n open \s+ foo\n
open \s+ baz\n open \s+ baz\n
$/ $/
---
"Test cat indices with invalid health parameter":
- do:
indices.create:
index: foo
body:
settings:
number_of_shards: "1"
number_of_replicas: "0"
- do:
catch: bad_request
cat.indices:
health: "invalid-health-value"

10
server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java
View File

@ -216,12 +216,14 @@ public class RestIndicesAction extends AbstractCatAction {
return new GroupedActionListener<>(new ActionListener<Collection<ActionResponse>>() { return new GroupedActionListener<>(new ActionListener<Collection<ActionResponse>>() {
@Override @Override
public void onResponse(final Collection<ActionResponse> responses) { public void onResponse(final Collection<ActionResponse> responses) {
try {
GetSettingsResponse settingsResponse = extractResponse(responses, GetSettingsResponse.class); GetSettingsResponse settingsResponse = extractResponse(responses, GetSettingsResponse.class);
Map<String, Settings> indicesSettings = StreamSupport.stream(settingsResponse.getIndexToSettings().spliterator(), false) Map<String, Settings> indicesSettings = StreamSupport.stream(settingsResponse.getIndexToSettings().spliterator(), false)
.collect(Collectors.toMap(cursor -> cursor.key, cursor -> cursor.value)); .collect(Collectors.toMap(cursor -> cursor.key, cursor -> cursor.value));
ClusterStateResponse stateResponse = extractResponse(responses, ClusterStateResponse.class); ClusterStateResponse stateResponse = extractResponse(responses, ClusterStateResponse.class);
Map<String, IndexMetadata> indicesStates = StreamSupport.stream(stateResponse.getState().getMetadata().spliterator(), false) Map<String, IndexMetadata> indicesStates =
StreamSupport.stream(stateResponse.getState().getMetadata().spliterator(), false)
.collect(Collectors.toMap(indexMetadata -> indexMetadata.getIndex().getName(), Function.identity())); .collect(Collectors.toMap(indexMetadata -> indexMetadata.getIndex().getName(), Function.identity()));
ClusterHealthResponse healthResponse = extractResponse(responses, ClusterHealthResponse.class); ClusterHealthResponse healthResponse = extractResponse(responses, ClusterHealthResponse.class);
@ -230,7 +232,11 @@ public class RestIndicesAction extends AbstractCatAction {
IndicesStatsResponse statsResponse = extractResponse(responses, IndicesStatsResponse.class); IndicesStatsResponse statsResponse = extractResponse(responses, IndicesStatsResponse.class);
Map<String, IndexStats> indicesStats = statsResponse.getIndices(); Map<String, IndexStats> indicesStats = statsResponse.getIndices();
listener.onResponse(buildTable(request, indicesSettings, indicesHealths, indicesStats, indicesStates)); Table responseTable = buildTable(request, indicesSettings, indicesHealths, indicesStats, indicesStates);
listener.onResponse(responseTable);
} catch (Exception e) {
onFailure(e);
}
} }
@Override @Override