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 the BWC version for the return200ForClusterHealthTimeout field #79436

Merged
merged 15 commits into from
Oct 19, 2021
Merged

Adjust the BWC version for the return200ForClusterHealthTimeout field #79436

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4c0fb7e
Adjust the BWC version for the return_200_for_cluster_health_timeout …
arteam Oct 19, 2021
d2c6984
Update BWC for ClusterHealthRequest and ClusterHealthResponse
arteam Oct 19, 2021
1cc4137
Update BWC comments
arteam Oct 19, 2021
1a88243
Update rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cl…
arteam Oct 19, 2021
9ceb132
Remove version checks
arteam Oct 19, 2021
c01430d
Optimize imports
arteam Oct 19, 2021
3dfdd1c
Revert "Remove version checks"
arteam Oct 19, 2021
1f32b94
Revert "Optimize imports"
arteam Oct 19, 2021
740eab3
Check for 7.16
arteam Oct 19, 2021
afb592c
Remove else block with the IllegalStateException
arteam Oct 19, 2021
6cbb930
Revert "Check for 7.16"
arteam Oct 19, 2021
777a580
Revert "Remove else block with the IllegalStateException"
arteam Oct 19, 2021
dc2f547
Remove version checks
arteam Oct 19, 2021
584c1d0
Optimize imports
arteam Oct 19, 2021
d6627fe
Disable ClusterHealthRequestTests#testBwcSerialization
arteam Oct 19, 2021
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 ...-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.health/20_request_timeout.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
---
"cluster health request timeout with 200 response code":
- skip:
version: " - 7.99.99"
reason: "return_200_for_cluster_health_timeout exists only in 8.0.0; re-enable in 7.16+ when back-ported"
version: " - 7.15.99"
reason: "return_200_for_cluster_health_timeout was added in 7.16"
- do:
cluster.health:
timeout: 1ms
Expand Down
6 changes: 2 additions & 4 deletions server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public ClusterHealthRequest(StreamInput in) throws IOException {
} else {
indicesOptions = IndicesOptions.lenientExpandOpen();
}
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
if (in.getVersion().onOrAfter(Version.V_7_16_0)) {
return200ForClusterHealthTimeout = in.readBoolean();
}
}
Expand Down Expand Up @@ -102,10 +102,8 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getVersion().onOrAfter(Version.V_7_2_0)) {
indicesOptions.writeIndicesOptions(out);
}
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
if (out.getVersion().onOrAfter(Version.V_7_16_0)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We won't ever be talking to a version prior to 7.16.0 so this will always be true - you can just remove the else branch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I didn't mean just remove the else branch, sorry, this condition is always true so there's no point in checking it either.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(this comment also applies to the other places we check it)

out.writeBoolean(return200ForClusterHealthTimeout);
} else if (return200ForClusterHealthTimeout) {
throw new IllegalArgumentException("Can't fix response code in a cluster involving nodes with version " + out.getVersion());
}
}

Expand Down
6 changes: 2 additions & 4 deletions ...er/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public ClusterHealthResponse(StreamInput in) throws IOException {
numberOfInFlightFetch = in.readInt();
delayedUnassignedShards= in.readInt();
taskMaxWaitingTime = in.readTimeValue();
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
if (in.getVersion().onOrAfter(Version.V_7_16_0)) {
return200ForClusterHealthTimeout = in.readBoolean();
}
}
Expand Down Expand Up @@ -304,10 +304,8 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeInt(numberOfInFlightFetch);
out.writeInt(delayedUnassignedShards);
out.writeTimeValue(taskMaxWaitingTime);
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
if (out.getVersion().onOrAfter(Version.V_7_16_0)) {
out.writeBoolean(return200ForClusterHealthTimeout);
} else if (return200ForClusterHealthTimeout) {
throw new IllegalArgumentException("Can't fix response code in a cluster involving nodes with version " + out.getVersion());
}
}

Expand Down