Skip to content

Commit

Permalink
Complete backport of elastic#59755
Browse files Browse the repository at this point in the history
Adjusts the version logic used for BWC and reinstates the BWC tests
  • Loading branch information
DaveCTurner committed Jul 20, 2020
1 parent 406bad8 commit 91bfb98
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ tasks.register("verifyVersions") {
* after the backport of the backcompat code is complete.
*/

boolean bwc_tests_enabled = false
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/59755" /* place a PR link here when committing bwc changes */
boolean bwc_tests_enabled = true
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
if (bwc_tests_enabled == false) {
if (bwc_tests_disabled_issue.isEmpty()) {
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")
Expand Down
10 changes: 0 additions & 10 deletions server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

package org.elasticsearch.monitor.fs;

import org.elasticsearch.Version;
import org.elasticsearch.cluster.DiskUsage;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -435,10 +433,6 @@ public FsInfo(StreamInput in) throws IOException {
paths[i] = new Path(in);
}
this.total = total();
if (in.getVersion().before(Version.V_8_0_0)) {
in.readOptionalWriteable(DiskUsage::new); // previously leastDiskEstimate
in.readOptionalWriteable(DiskUsage::new); // previously mostDiskEstimate
}
}

@Override
Expand All @@ -449,10 +443,6 @@ public void writeTo(StreamOutput out) throws IOException {
for (Path path : paths) {
path.writeTo(out);
}
if (out.getVersion().before(Version.V_8_0_0)) {
out.writeOptionalWriteable(null); // previously leastDiskEstimate
out.writeOptionalWriteable(null); // previously mostDiskEstimate
}
}

public Path getTotal() {
Expand Down

0 comments on commit 91bfb98

Please sign in to comment.