From 51f442bf98060144021c77fecd7d0fcd31dac6ac Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 12 Sep 2023 19:09:08 -0700 Subject: [PATCH] Infer index version for 8.10 patches (#99501) (#99503) This commit fixes a missed poison pill for inferring index version. The changed logic allows inferring to work on 8.10 patches, not just 8.10.0. see #99003 --- .../org/elasticsearch/cluster/node/VersionInformation.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/node/VersionInformation.java b/server/src/main/java/org/elasticsearch/cluster/node/VersionInformation.java index 84b5946c8e19f..9f70c7bc27336 100644 --- a/server/src/main/java/org/elasticsearch/cluster/node/VersionInformation.java +++ b/server/src/main/java/org/elasticsearch/cluster/node/VersionInformation.java @@ -32,7 +32,8 @@ public static VersionInformation inferVersions(Version nodeVersion) { return null; } else if (nodeVersion.equals(Version.CURRENT)) { return CURRENT; - } else if (nodeVersion.before(Version.V_8_10_0)) { + } else if (nodeVersion.before(Version.CURRENT)) { + // CURRENT here is always before 8.11.0 return new VersionInformation( nodeVersion, IndexVersion.fromId(nodeVersion.minimumIndexCompatibilityVersion().id),