Skip to content

Commit 11840f0

Browse files
authored
Unmute bwc tests and adjust bwc serialization in DiscoveryStats (#78917)
See #77552
1 parent 216f135 commit 11840f0

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
@@ -134,9 +134,9 @@ tasks.register("verifyVersions") {
134134
* after the backport of the backcompat code is complete.
135135
*/
136136

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

server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public DiscoveryStats(StreamInput in) throws IOException {
4747
} else {
4848
clusterStateUpdateStats = null;
4949
}
50-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
50+
if (in.getVersion().onOrAfter(Version.V_7_16_0)) {
5151
applierRecordingStats = in.readOptionalWriteable(ClusterApplierRecordingService.Stats::new);
5252
} else {
5353
applierRecordingStats = null;
@@ -61,7 +61,7 @@ public void writeTo(StreamOutput out) throws IOException {
6161
if (out.getVersion().onOrAfter(Version.V_7_16_0)) {
6262
out.writeOptionalWriteable(clusterStateUpdateStats);
6363
}
64-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
64+
if (out.getVersion().onOrAfter(Version.V_7_16_0)) {
6565
out.writeOptionalWriteable(applierRecordingStats);
6666
}
6767
}

0 commit comments

Comments
 (0)