Skip to content

Commit 14a6bb4

Browse files
authored
Adjust serialization version and re-enable BWC (#68335)
Adjust ResizeRequest and ShrinkAction serialization now that #68321 has been merged, and re-enable BWC testing. Related to #67705, #68321, and #68329
1 parent 460b33f commit 14a6bb4

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ tasks.register("verifyVersions") {
175175
* after the backport of the backcompat code is complete.
176176
*/
177177

178-
boolean bwc_tests_enabled = false
179-
String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/68321" /* place a PR link here when committing bwc changes */
178+
boolean bwc_tests_enabled = true
179+
String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
180180
/*
181181
* FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
182182
* JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable

server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public ResizeRequest(StreamInput in) throws IOException {
7070
sourceIndex = in.readString();
7171
type = in.readEnum(ResizeType.class);
7272
copySettings = in.readOptionalBoolean();
73-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
73+
if (in.getVersion().onOrAfter(Version.V_7_12_0)) {
7474
if (in.readBoolean()) {
7575
maxSinglePrimarySize = new ByteSizeValue(in);
7676
}
@@ -117,7 +117,7 @@ public void writeTo(StreamOutput out) throws IOException {
117117
out.writeString(sourceIndex);
118118
out.writeEnum(type);
119119
out.writeOptionalBoolean(copySettings);
120-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
120+
if (out.getVersion().onOrAfter(Version.V_7_12_0)) {
121121
out.writeOptionalWriteable(maxSinglePrimarySize);
122122
}
123123
}

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/ShrinkAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public ShrinkAction(@Nullable Integer numberOfShards, @Nullable ByteSizeValue ma
8080
}
8181

8282
public ShrinkAction(StreamInput in) throws IOException {
83-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
83+
if (in.getVersion().onOrAfter(Version.V_7_12_0)) {
8484
if (in.readBoolean()) {
8585
this.numberOfShards = in.readVInt();
8686
this.maxSinglePrimarySize = null;
@@ -104,7 +104,7 @@ ByteSizeValue getMaxSinglePrimarySize() {
104104

105105
@Override
106106
public void writeTo(StreamOutput out) throws IOException {
107-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
107+
if (out.getVersion().onOrAfter(Version.V_7_12_0)) {
108108
boolean hasNumberOfShards = numberOfShards != null;
109109
out.writeBoolean(hasNumberOfShards);
110110
if (hasNumberOfShards) {

0 commit comments

Comments
 (0)