Skip to content

Commit cbd309b

Browse files
committed
add support for is_write_index in put-alias body parsing (#31674)
* 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
1 parent 156d580 commit cbd309b

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,27 @@
5959
indices.put_alias:
6060
index: test_index
6161
name: foo
62+
63+
---
64+
"Can set is_write_index":
65+
66+
- skip:
67+
version: " - 6.3.99"
68+
reason: "is_write_index is only available from 6.4.0 on"
69+
70+
- do:
71+
indices.create:
72+
index: test_index
73+
74+
- do:
75+
indices.put_alias:
76+
index: test_index
77+
name: test_alias
78+
body:
79+
is_write_index: true
80+
81+
- do:
82+
indices.get_alias:
83+
index: test_index
84+
name: test_alias
85+
- match: {test_index.aliases.test_alias: { 'is_write_index': true }}

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
6666
String routing = null;
6767
String indexRouting = null;
6868
String searchRouting = null;
69+
Boolean writeIndex = null;
6970

7071
if (request.hasContent()) {
7172
try (XContentParser parser = request.contentParser()) {
@@ -90,6 +91,8 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
9091
} else if ("searchRouting".equals(currentFieldName)
9192
|| "search-routing".equals(currentFieldName) || "search_routing".equals(currentFieldName)) {
9293
searchRouting = parser.textOrNull();
94+
} else if ("is_write_index".equals(currentFieldName)) {
95+
writeIndex = parser.booleanValue();
9396
}
9497
} else if (token == XContentParser.Token.START_OBJECT) {
9598
if ("filter".equals(currentFieldName)) {
@@ -117,6 +120,9 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
117120
if (filter != null) {
118121
aliasAction.filter(filter);
119122
}
123+
if (writeIndex != null) {
124+
aliasAction.writeIndex(writeIndex);
125+
}
120126
indicesAliasesRequest.addAliasAction(aliasAction);
121127
return channel -> client.admin().indices().aliases(indicesAliasesRequest, new RestToXContentListener<>(channel));
122128
}

0 commit comments

Comments
 (0)