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

add support for is_write_index in put-alias body parsing #31674

Merged
merged 4 commits into from
Jul 9, 2018
Merged

add support for is_write_index in put-alias body parsing #31674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d8aa5e
add support for is_write_index in put-alias body parsing
talevy Jun 28, 2018
7c603cc
test flag was not just ignored by the parser
talevy Jun 29, 2018
dc344a6
Merge branch 'master' into put-write-alias
talevy Jul 9, 2018
b28dee9
disable backcompat tests
talevy Jul 9, 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
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ task verifyVersions {
* the enabled state of every bwc task. It should be set back to true
* after the backport of the backcompat code is complete.
*/
final boolean bwc_tests_enabled = true
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
final boolean bwc_tests_enabled = false
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/31674" /* place a PR link here when committing bwc changes */
if (bwc_tests_enabled == false) {
if (bwc_tests_disabled_issue.isEmpty()) {
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")
Expand Down
24 changes: 24 additions & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,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 }}
6 changes: 6 additions & 0 deletions ...er/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java
View file
Open in desktop
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