Skip to content

Commit 60336c4

Browse files
authored
Adjust ILM policy version and re-enable BWC testing (#73628)
This re-enables the BWC removed in #73625 now that #73624 has been merged
1 parent 78905ba commit 60336c4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ tasks.register("verifyVersions") {
170170
* after the backport of the backcompat code is complete.
171171
*/
172172

173-
boolean bwc_tests_enabled = false
173+
boolean bwc_tests_enabled = true
174174
// place a PR link here when committing bwc changes:
175-
String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/73624"
175+
String bwc_tests_disabled_issue = ""
176176
/*
177177
* FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
178178
* 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/LifecyclePolicy.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public LifecyclePolicy(StreamInput in) throws IOException {
9999
type = in.readNamedWriteable(LifecycleType.class);
100100
name = in.readString();
101101
phases = Collections.unmodifiableMap(in.readMap(StreamInput::readString, Phase::new));
102-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
102+
if (in.getVersion().onOrAfter(Version.V_7_14_0)) {
103103
this.metadata = in.readMap();
104104
} else {
105105
this.metadata = null;
@@ -134,7 +134,7 @@ public void writeTo(StreamOutput out) throws IOException {
134134
out.writeNamedWriteable(type);
135135
out.writeString(name);
136136
out.writeMap(phases, StreamOutput::writeString, (o, val) -> val.writeTo(o));
137-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
137+
if (out.getVersion().onOrAfter(Version.V_7_14_0)) {
138138
out.writeMap(this.metadata);
139139
}
140140
}

0 commit comments

Comments
 (0)