Skip to content

Commit e3a04c9

Browse files
committed
Renable bwc and update version checks after merging elastic#72754
1 parent 71a9cfe commit e3a04c9

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ tasks.register("verifyVersions") {
196196
* after the backport of the backcompat code is complete.
197197
*/
198198

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

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,12 @@ public DeviceStats(StreamInput in) throws IOException {
237237
previousSectorsRead = in.readLong();
238238
currentSectorsWritten = in.readLong();
239239
previousSectorsWritten = in.readLong();
240-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
240+
if (in.getVersion().onOrAfter(Version.V_7_14_0)) {
241241
currentIOTime = in.readLong();
242242
previousIOTime = in.readLong();
243243
} else {
244-
currentIOTime = 0;
245-
previousIOTime = 0;
244+
currentIOTime = -1;
245+
previousIOTime = -1;
246246
}
247247
}
248248

@@ -259,7 +259,7 @@ public void writeTo(StreamOutput out) throws IOException {
259259
out.writeLong(previousSectorsRead);
260260
out.writeLong(currentSectorsWritten);
261261
out.writeLong(previousSectorsWritten);
262-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
262+
if (out.getVersion().onOrAfter(Version.V_7_14_0)) {
263263
out.writeLong(currentIOTime);
264264
out.writeLong(previousIOTime);
265265
}
@@ -370,10 +370,10 @@ public IoStats(StreamInput in) throws IOException {
370370
this.totalWriteOperations = in.readLong();
371371
this.totalReadKilobytes = in.readLong();
372372
this.totalWriteKilobytes = in.readLong();
373-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
373+
if (in.getVersion().onOrAfter(Version.V_7_14_0)) {
374374
this.totalIOTimeInMillis = in.readLong();
375375
} else {
376-
this.totalIOTimeInMillis = 0;
376+
this.totalIOTimeInMillis = -1;
377377
}
378378
}
379379

@@ -388,7 +388,7 @@ public void writeTo(StreamOutput out) throws IOException {
388388
out.writeLong(totalWriteOperations);
389389
out.writeLong(totalReadKilobytes);
390390
out.writeLong(totalWriteKilobytes);
391-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
391+
if (out.getVersion().onOrAfter(Version.V_7_14_0)) {
392392
out.writeLong(totalIOTimeInMillis);
393393
}
394394
}

0 commit comments

Comments
 (0)