diff --git a/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java b/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java index c022819b58c24..5ec2be2c73fac 100644 --- a/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java +++ b/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java @@ -202,10 +202,19 @@ public Swap(long total, long free) { } public Swap(StreamInput in) throws IOException { - this.total = in.readLong(); - assert total >= 0 : "expected total swap to be positive, got: " + total; - this.free = in.readLong(); - assert free >= 0 : "expected free swap to be positive, got: " + total; + if (in.getVersion().onOrAfter(Version.V_6_8_14)) { + this.total = in.readLong(); + assert total >= 0 : "expected total swap to be positive, got: " + total; + this.free = in.readLong(); + assert free >= 0 : "expected free swap to be positive, got: " + total; + } else { + // If we have a node in the cluster without the bug fix for + // negative memory values, we need to coerce negative values to 0 here. + // The relevant bug fix was added for 7.8.0 in https://github.com/elastic/elasticsearch/pull/57317 + // and for 6.8.14 in https://github.com/elastic/elasticsearch/pull/68554 + this.total = Math.max(0, in.readLong()); + this.free = Math.max(0, in.readLong()); + } } @Override @@ -263,10 +272,18 @@ public Mem(long total, long free) { } public Mem(StreamInput in) throws IOException { - this.total = in.readLong(); - assert total >= 0 : "expected total memory to be positive, got: " + total; - this.free = in.readLong(); - assert free >= 0 : "expected free memory to be positive, got: " + total; + if (in.getVersion().onOrAfter(Version.V_6_8_2)) { + this.total = in.readLong(); + assert total >= 0 : "expected total memory to be positive, got: " + total; + this.free = in.readLong(); + assert free >= 0 : "expected free memory to be positive, got: " + total; + } else { + // If we have a node in the cluster without the bug fix for + // negative memory values, we need to coerce negative values to 0 here. + // The relevant bug fix was added for 7.2.0 and 6.8.2 in https://github.com/elastic/elasticsearch/pull/42725 + this.total = Math.max(0, in.readLong()); + this.free = Math.max(0, in.readLong()); + } } @Override