Skip to content

Commit 6fe66c0

Browse files
authored
Complete backport of #59755 (#59887)
Adjusts the version logic used for BWC and reinstates the BWC tests
1 parent c41ac5f commit 6fe66c0

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

build.gradle

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

177-
boolean bwc_tests_enabled = false
178-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/59755" /* place a PR link here when committing bwc changes */
177+
boolean bwc_tests_enabled = true
178+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
179179
if (bwc_tests_enabled == false) {
180180
if (bwc_tests_disabled_issue.isEmpty()) {
181181
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
package org.elasticsearch.monitor.fs;
2121

22-
import org.elasticsearch.Version;
23-
import org.elasticsearch.cluster.DiskUsage;
2422
import org.elasticsearch.common.Nullable;
2523
import org.elasticsearch.common.io.stream.StreamInput;
2624
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -435,10 +433,6 @@ public FsInfo(StreamInput in) throws IOException {
435433
paths[i] = new Path(in);
436434
}
437435
this.total = total();
438-
if (in.getVersion().before(Version.V_8_0_0)) {
439-
in.readOptionalWriteable(DiskUsage::new); // previously leastDiskEstimate
440-
in.readOptionalWriteable(DiskUsage::new); // previously mostDiskEstimate
441-
}
442436
}
443437

444438
@Override
@@ -449,10 +443,6 @@ public void writeTo(StreamOutput out) throws IOException {
449443
for (Path path : paths) {
450444
path.writeTo(out);
451445
}
452-
if (out.getVersion().before(Version.V_8_0_0)) {
453-
out.writeOptionalWriteable(null); // previously leastDiskEstimate
454-
out.writeOptionalWriteable(null); // previously mostDiskEstimate
455-
}
456446
}
457447

458448
public Path getTotal() {

0 commit comments

Comments
 (0)