Skip to content

Commit 11c8e0b

Browse files
committed
Adjust version serialization and re-enable BWC after backport
Now that elastic#68762 is merged, BWC should be re-enabled.
1 parent 20cab22 commit 11c8e0b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public SearchableSnapshotAction(StreamInput in) throws IOException {
101101
} else {
102102
this.forceMergeIndex = true;
103103
}
104-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
104+
if (in.getVersion().onOrAfter(Version.V_7_12_0)) {
105105
this.storageType = in.readOptionalEnum(MountSearchableSnapshotRequest.Storage.class);
106106
} else {
107107
this.storageType = null;
@@ -333,7 +333,7 @@ public void writeTo(StreamOutput out) throws IOException {
333333
if (out.getVersion().onOrAfter(Version.V_7_10_0)) {
334334
out.writeBoolean(forceMergeIndex);
335335
}
336-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
336+
if (out.getVersion().onOrAfter(Version.V_7_12_0)) {
337337
out.writeOptionalEnum(storageType);
338338
}
339339
}

0 commit comments

Comments
 (0)