Skip to content

Commit

Permalink
add support for is_write_index in put-alias body parsing (#31674)
Browse files Browse the repository at this point in the history
* add support for is_write_index in put-alias body parsing

The Rest Put-Alias Action does separate parsing of the alias body
to construct the IndicesAliasesRequest. This extra parsing
was missed in #30703.

* test flag was not just ignored by the parser
  • Loading branch information
talevy committed Jul 9, 2018
1 parent 156d580 commit cbd309b
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,27 @@
indices.put_alias:
index: test_index
name: foo

---
"Can set is_write_index":

- skip:
version: " - 6.3.99"
reason: "is_write_index is only available from 6.4.0 on"

- do:
indices.create:
index: test_index

- do:
indices.put_alias:
index: test_index
name: test_alias
body:
is_write_index: true

- do:
indices.get_alias:
index: test_index
name: test_alias
- match: {test_index.aliases.test_alias: { 'is_write_index': true }}
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
String routing = null;
String indexRouting = null;
String searchRouting = null;
Boolean writeIndex = null;

if (request.hasContent()) {
try (XContentParser parser = request.contentParser()) {
Expand All @@ -90,6 +91,8 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
} else if ("searchRouting".equals(currentFieldName)
|| "search-routing".equals(currentFieldName) || "search_routing".equals(currentFieldName)) {
searchRouting = parser.textOrNull();
} else if ("is_write_index".equals(currentFieldName)) {
writeIndex = parser.booleanValue();
}
} else if (token == XContentParser.Token.START_OBJECT) {
if ("filter".equals(currentFieldName)) {
Expand Down Expand Up @@ -117,6 +120,9 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
if (filter != null) {
aliasAction.filter(filter);
}
if (writeIndex != null) {
aliasAction.writeIndex(writeIndex);
}
indicesAliasesRequest.addAliasAction(aliasAction);
return channel -> client.admin().indices().aliases(indicesAliasesRequest, new RestToXContentListener<>(channel));
}
Expand Down

0 comments on commit cbd309b

Please sign in to comment.