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

Adjust versions for resize copy settings #30578

Merged
merged 1 commit into from
May 14, 2018
Merged

Adjust versions for resize copy settings #30578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
"Shrink index via API":
- skip:
version: " - 6.99.99"
reason: expects warnings that pre-7.0.0 will not send
version: " - 6.3.99"
reason: expects warnings that pre-6.4.0 will not send
features: "warnings"
# creates an index with one document solely allocated on the master node
# and shrinks it into a new index with a single shard
Expand Down
4 changes: 2 additions & 2 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/20_source_mapping.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
"Shrink index ignores target template mapping":
- skip:
version: " - 6.99.99"
reason: expects warnings that pre-7.0.0 will not send
version: " - 6.3.99"
reason: expects warnings that pre-6.4.0 will not send
features: "warnings"

- do:
Expand Down
4 changes: 2 additions & 2 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/30_copy_settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
"Copy settings during shrink index":
- skip:
version: " - 6.99.99"
reason: expects warnings that pre-7.0.0 will not send
version: " - 6.3.99"
reason: expects warnings that pre-6.4.0 will not send
features: "warnings"

- do:
Expand Down
12 changes: 6 additions & 6 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ setup:
---
"Split index via API":
- skip:
version: " - 6.99.99"
reason: expects warnings that pre-7.0.0 will not send
version: " - 6.3.99"
reason: expects warnings that pre-6.4.0 will not send
features: "warnings"

# make it read-only
Expand Down Expand Up @@ -110,8 +110,8 @@ setup:
# when re-enabling uncomment the below skips
version: "all"
reason: "AwaitsFix'ing, see https://github.com/elastic/elasticsearch/issues/30503"
# version: " - 6.99.99"
# reason: expects warnings that pre-7.0.0 will not send
# version: " - 6.3.99"
# reason: expects warnings that pre-6.4.0 will not send
features: "warnings"
- do:
indices.create:
Expand Down Expand Up @@ -213,8 +213,8 @@ setup:
---
"Create illegal split indices":
- skip:
version: " - 6.99.99"
reason: expects warnings that pre-7.0.0 will not send
version: " - 6.3.99"
reason: expects warnings that pre-6.4.0 will not send
features: "warnings"

# try to do an illegal split with number_of_routing_shards set
Expand Down
4 changes: 2 additions & 2 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/20_source_mapping.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# when re-enabling uncomment the below skips
version: "all"
reason: "AwaitsFix'ing, see https://github.com/elastic/elasticsearch/issues/30503"
# version: " - 6.99.99"
# reason: expects warnings that pre-7.0.0 will not send
# version: " - 6.3.99"
# reason: expects warnings that pre-6.4.0 will not send
features: "warnings"

# create index
Expand Down
4 changes: 2 additions & 2 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/30_copy_settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
"Copy settings during split index":
- skip:
version: " - 6.99.99"
reason: expects warnings that pre-7.0.0 will not send
version: " - 6.3.99"
reason: expects warnings that pre-6.4.0 will not send
features: "warnings"

- do:
Expand Down
5 changes: 1 addition & 4 deletions server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ public void readFrom(StreamInput in) throws IOException {
}
if (in.getVersion().before(Version.V_6_4_0)) {
copySettings = null;
} else if (in.getVersion().onOrAfter(Version.V_6_4_0) && in.getVersion().before(Version.V_7_0_0_alpha1)){
copySettings = in.readBoolean();
} else {
copySettings = in.readOptionalBoolean();
}
Expand All @@ -116,10 +114,9 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getVersion().onOrAfter(ResizeAction.COMPATIBILITY_VERSION)) {
out.writeEnum(type);
}
// noinspection StatementWithEmptyBody
if (out.getVersion().before(Version.V_6_4_0)) {

} else if (out.getVersion().onOrAfter(Version.V_6_4_0) && out.getVersion().before(Version.V_7_0_0_alpha1)) {
out.writeBoolean(copySettings == null ? false : copySettings);
} else {
out.writeOptionalBoolean(copySettings);
}
Expand Down