From a2acaa046a65faf53c26d0acdb9269d2415eed23 Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Tue, 4 Jul 2023 14:50:05 +0100 Subject: [PATCH 1/5] Add IndexVersion to MainResponse --- .../elasticsearch/rest/root/MainResponse.java | 57 +++++++++++++++++-- .../rest/root/TransportMainAction.java | 2 + .../rest/root/MainResponseTests.java | 30 +++++++--- .../rest/root/RestMainActionTests.java | 23 +++++++- .../org/elasticsearch/TransportVersion.java | 3 +- .../xpack/sql/jdbc/WebServerTestCase.java | 8 ++- 6 files changed, 105 insertions(+), 18 deletions(-) diff --git a/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainResponse.java b/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainResponse.java index b54b7ac48948e..0f51866554f6e 100644 --- a/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainResponse.java +++ b/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainResponse.java @@ -15,6 +15,7 @@ import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; +import org.elasticsearch.index.IndexVersion; import org.elasticsearch.xcontent.ObjectParser; import org.elasticsearch.xcontent.ParseField; import org.elasticsearch.xcontent.ToXContentObject; @@ -28,6 +29,7 @@ public class MainResponse extends ActionResponse implements ToXContentObject { private String nodeName; private Version version; + private IndexVersion indexVersion; private TransportVersion transportVersion; private ClusterName clusterName; private String clusterUuid; @@ -39,7 +41,8 @@ public class MainResponse extends ActionResponse implements ToXContentObject { super(in); nodeName = in.readString(); version = Version.readVersion(in); - transportVersion = in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_014) ? TransportVersion.readVersion(in) : null; + indexVersion = in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_031) ? IndexVersion.readVersion(in) : null; + transportVersion = in.getTransportVersion().onOrAfter(TransportVersion.V_8_500_019) ? TransportVersion.readVersion(in) : null; clusterName = new ClusterName(in); clusterUuid = in.readString(); build = Build.readBuild(in); @@ -48,6 +51,7 @@ public class MainResponse extends ActionResponse implements ToXContentObject { public MainResponse( String nodeName, Version version, + IndexVersion indexVersion, TransportVersion transportVersion, ClusterName clusterName, String clusterUuid, @@ -55,6 +59,7 @@ public MainResponse( ) { this.nodeName = nodeName; this.version = version; + this.indexVersion = indexVersion; this.transportVersion = transportVersion; this.clusterName = clusterName; this.clusterUuid = clusterUuid; @@ -69,6 +74,10 @@ public Version getVersion() { return version; } + public IndexVersion getIndexVersion() { + return indexVersion; + } + public TransportVersion getTransportVersion() { return transportVersion; } @@ -89,6 +98,9 @@ public Build getBuild() { public void writeTo(StreamOutput out) throws IOException { out.writeString(nodeName); Version.writeVersion(version, out); + if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_031)) { + IndexVersion.writeVersion(indexVersion, out); + } if (out.getTransportVersion().onOrAfter(TransportVersion.V_8_500_019)) { TransportVersion.writeVersion(transportVersion, out); } @@ -97,6 +109,26 @@ public void writeTo(StreamOutput out) throws IOException { Build.writeBuild(build, out); } + private String getLuceneVersion() { + if (indexVersion != null) { + return indexVersion.luceneVersion().toString(); + } else if (version.before(Version.V_8_10_0)) { + return IndexVersion.fromId(version.id).luceneVersion().toString(); + } else { + return "unknown"; + } + } + + private String getMinimumWireCompatibilityVersion() { + // this is no longer computed from Version + return TransportVersion.current().equals(transportVersion) ? TransportVersion.MINIMUM_COMPATIBLE.toString() : "unknown"; + } + + private String getMinimumIndexCompatibilityVersion() { + // this is no longer computed from Version + return IndexVersion.current().equals(indexVersion) ? IndexVersion.MINIMUM_COMPATIBLE.toString() : "unknown"; + } + @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); @@ -110,9 +142,10 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws .field("build_hash", build.hash()) .field("build_date", build.date()) .field("build_snapshot", build.isSnapshot()) - .field("lucene_version", version.luceneVersion().toString()) - .field("minimum_wire_compatibility_version", version.minimumCompatibilityVersion().toString()) - .field("minimum_index_compatibility_version", version.minimumIndexCompatibilityVersion().toString()) + .field("lucene_version", getLuceneVersion()) + .field("index_version", indexVersion != null ? indexVersion.toString() : "unknown") + .field("minimum_wire_compatibility_version", getMinimumWireCompatibilityVersion()) + .field("minimum_index_compatibility_version", getMinimumIndexCompatibilityVersion()) .field("transport_version", transportVersion != null ? transportVersion.toString() : "unknown") .endObject(); builder.field("tagline", "You Know, for Search"); @@ -147,7 +180,16 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws response.version = Version.fromString( ((String) value.get("number")).replace("-SNAPSHOT", "").replaceFirst("-(alpha\\d+|beta\\d+|rc\\d+)", "") ); - response.transportVersion = TransportVersion.fromString(((String) value.get("transport_version"))); + + String indexVersion = (String) value.get("index_version"); + response.indexVersion = indexVersion != null && indexVersion.equals("unknown") == false + ? IndexVersion.fromId(Integer.parseInt(indexVersion)) + : null; + + String transportVersion = (String) value.get("transport_version"); + response.transportVersion = transportVersion != null && transportVersion.equals("unknown") == false + ? TransportVersion.fromString(transportVersion) + : null; }, (parser, context) -> parser.map(), new ParseField("version")); } @@ -166,6 +208,7 @@ public boolean equals(Object o) { MainResponse other = (MainResponse) o; return Objects.equals(nodeName, other.nodeName) && Objects.equals(version, other.version) + && Objects.equals(indexVersion, other.indexVersion) && Objects.equals(transportVersion, other.transportVersion) && Objects.equals(clusterUuid, other.clusterUuid) && Objects.equals(build, other.build) @@ -174,7 +217,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(nodeName, version, transportVersion, clusterUuid, build, clusterName); + return Objects.hash(nodeName, version, indexVersion, transportVersion, clusterUuid, build, clusterName); } @Override @@ -185,6 +228,8 @@ public String toString() { + '\'' + ", version=" + version + + ", indexVersion=" + + indexVersion + ", transportVersion=" + transportVersion + ", clusterName=" diff --git a/modules/rest-root/src/main/java/org/elasticsearch/rest/root/TransportMainAction.java b/modules/rest-root/src/main/java/org/elasticsearch/rest/root/TransportMainAction.java index 633e3273e47f8..9f833ea5e96cc 100644 --- a/modules/rest-root/src/main/java/org/elasticsearch/rest/root/TransportMainAction.java +++ b/modules/rest-root/src/main/java/org/elasticsearch/rest/root/TransportMainAction.java @@ -18,6 +18,7 @@ import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.index.IndexVersion; import org.elasticsearch.node.Node; import org.elasticsearch.tasks.Task; import org.elasticsearch.transport.TransportService; @@ -46,6 +47,7 @@ protected void doExecute(Task task, MainRequest request, ActionListener clusterUuid = clusterUuid + randomAlphaOfLength(5); case 1 -> nodeName = nodeName + randomAlphaOfLength(5); case 2 -> @@ -115,7 +130,8 @@ protected MainResponse mutateInstance(MainResponse mutateInstance) { case 3 -> version = randomValueOtherThan(version, () -> VersionUtils.randomVersion(random())); case 4 -> clusterName = new ClusterName(clusterName + randomAlphaOfLength(5)); case 5 -> transportVersion = randomValueOtherThan(transportVersion, () -> TransportVersionUtils.randomVersion(random())); + case 6 -> indexVersion = randomValueOtherThan(indexVersion, () -> IndexVersionUtils.randomVersion(random())); } - return new MainResponse(nodeName, version, transportVersion, clusterName, clusterUuid, build); + return new MainResponse(nodeName, version, indexVersion, transportVersion, clusterName, clusterUuid, build); } } diff --git a/modules/rest-root/src/test/java/org/elasticsearch/rest/root/RestMainActionTests.java b/modules/rest-root/src/test/java/org/elasticsearch/rest/root/RestMainActionTests.java index 0c8c0dbd3a2fd..7bcf5d512b4dc 100644 --- a/modules/rest-root/src/test/java/org/elasticsearch/rest/root/RestMainActionTests.java +++ b/modules/rest-root/src/test/java/org/elasticsearch/rest/root/RestMainActionTests.java @@ -13,6 +13,7 @@ import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.common.bytes.BytesReference; +import org.elasticsearch.index.IndexVersion; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestResponse; import org.elasticsearch.rest.RestStatus; @@ -35,10 +36,19 @@ public void testHeadResponse() throws Exception { final ClusterName clusterName = new ClusterName("cluster1"); final String clusterUUID = randomAlphaOfLengthBetween(10, 20); final Version version = Version.CURRENT; + final IndexVersion indexVersion = IndexVersion.current(); final TransportVersion transportVersion = TransportVersion.current(); final Build build = Build.CURRENT; - final MainResponse mainResponse = new MainResponse(nodeName, version, transportVersion, clusterName, clusterUUID, build); + final MainResponse mainResponse = new MainResponse( + nodeName, + version, + indexVersion, + transportVersion, + clusterName, + clusterUUID, + build + ); XContentBuilder builder = JsonXContent.contentBuilder(); RestRequest restRequest = new FakeRestRequest() { @Override @@ -60,11 +70,20 @@ public void testGetResponse() throws Exception { final ClusterName clusterName = new ClusterName("cluster1"); final String clusterUUID = randomAlphaOfLengthBetween(10, 20); final Version version = Version.CURRENT; + final IndexVersion indexVersion = IndexVersion.current(); final TransportVersion transportVersion = TransportVersion.current(); final Build build = Build.CURRENT; final boolean prettyPrint = randomBoolean(); - final MainResponse mainResponse = new MainResponse(nodeName, version, transportVersion, clusterName, clusterUUID, build); + final MainResponse mainResponse = new MainResponse( + nodeName, + version, + indexVersion, + transportVersion, + clusterName, + clusterUUID, + build + ); XContentBuilder builder = JsonXContent.contentBuilder(); Map params = new HashMap<>(); diff --git a/server/src/main/java/org/elasticsearch/TransportVersion.java b/server/src/main/java/org/elasticsearch/TransportVersion.java index 38be8bcf8379e..5ca06d5328515 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersion.java +++ b/server/src/main/java/org/elasticsearch/TransportVersion.java @@ -163,9 +163,10 @@ private static TransportVersion registerTransportVersion(int id, String uniqueId public static final TransportVersion V_8_500_028 = registerTransportVersion(8_500_028, "a6592d08-15cb-4e1a-b9b4-b2ba24058444"); public static final TransportVersion V_8_500_029 = registerTransportVersion(8_500_029, "f3bd98af-6187-e161-e315-718a2fecc2db"); public static final TransportVersion V_8_500_030 = registerTransportVersion(8_500_030, "b72d7f12-8ed3-4a5b-8e6a-4910ea10e0d7"); + public static final TransportVersion V_8_500_031 = registerTransportVersion(8_500_031, "e7aa7e95-37e7-46a3-aad1-90a21c0769e7"); private static class CurrentHolder { - private static final TransportVersion CURRENT = findCurrent(V_8_500_030); + private static final TransportVersion CURRENT = findCurrent(V_8_500_031); // finds the pluggable current version, or uses the given fallback private static TransportVersion findCurrent(TransportVersion fallback) { diff --git a/x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/WebServerTestCase.java b/x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/WebServerTestCase.java index 33d29ead479b5..7171be3f1b8bb 100644 --- a/x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/WebServerTestCase.java +++ b/x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/WebServerTestCase.java @@ -11,6 +11,7 @@ import org.elasticsearch.TransportVersion; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; +import org.elasticsearch.index.IndexVersion; import org.elasticsearch.rest.root.MainResponse; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.http.MockWebServer; @@ -24,7 +25,7 @@ */ public abstract class WebServerTestCase extends ESTestCase { - private MockWebServer webServer = new MockWebServer(); + private final MockWebServer webServer = new MockWebServer(); @Before public void init() throws Exception { @@ -45,13 +46,16 @@ MainResponse createCurrentVersionMainResponse() { } MainResponse createMainResponse(Version version) { + // the SQL client only cares about node version, + // so ignore index & transport versions here (just set them to current) String clusterUuid = randomAlphaOfLength(10); ClusterName clusterName = new ClusterName(randomAlphaOfLength(10)); String nodeName = randomAlphaOfLength(10); final String date = new Date(randomNonNegativeLong()).toString(); Build build = new Build(Build.Type.UNKNOWN, randomAlphaOfLength(8), date, randomBoolean(), version.toString()); + IndexVersion indexVersion = IndexVersion.current(); TransportVersion transportVersion = TransportVersion.current(); - return new MainResponse(nodeName, version, transportVersion, clusterName, clusterUuid, build); + return new MainResponse(nodeName, version, indexVersion, transportVersion, clusterName, clusterUuid, build); } String webServerAddress() { From aef98bdff612c3205347e2acada69eabcc42e253 Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Wed, 5 Jul 2023 10:03:22 +0100 Subject: [PATCH 2/5] Update lucene version check --- .../VerifyVersionConstantsIT.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java b/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java index 145d150ca61d5..5168765c434f6 100644 --- a/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java +++ b/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java @@ -8,12 +8,12 @@ package org.elasticsearch.qa.verify_version_constants; -import org.elasticsearch.Version; import org.elasticsearch.client.Request; import org.elasticsearch.client.Response; import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; +import org.elasticsearch.index.IndexVersion; import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.ObjectPath; @@ -25,14 +25,16 @@ public class VerifyVersionConstantsIT extends ESRestTestCase { public void testLuceneVersionConstant() throws IOException, ParseException { - final Response response = client().performRequest(new Request("GET", "/")); + Response response = client().performRequest(new Request("GET", "/")); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); - final ObjectPath objectPath = ObjectPath.createFromResponse(response); - final String elasticsearchVersionString = objectPath.evaluate("version.number").toString(); - final Version elasticsearchVersion = Version.fromString(elasticsearchVersionString.replace("-SNAPSHOT", "")); - final String luceneVersionString = objectPath.evaluate("version.lucene_version").toString(); - final org.apache.lucene.util.Version luceneVersion = org.apache.lucene.util.Version.parse(luceneVersionString); - assertThat(elasticsearchVersion.luceneVersion(), equalTo(luceneVersion)); + ObjectPath objectPath = ObjectPath.createFromResponse(response); + + String indexVersionString = objectPath.evaluate("version.index_version").toString(); + String luceneVersionString = objectPath.evaluate("version.lucene_version").toString(); + + IndexVersion indexVersion = IndexVersion.fromId(Integer.parseInt(indexVersionString)); + org.apache.lucene.util.Version luceneVersion = org.apache.lucene.util.Version.parse(luceneVersionString); + assertThat(indexVersion.luceneVersion(), equalTo(luceneVersion)); } @Override From 2b7dd0daf8419636870fbc786cadd8c5faf1d6eb Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Wed, 5 Jul 2023 10:52:51 +0100 Subject: [PATCH 3/5] Add BwC code for main response --- .../VerifyVersionConstantsIT.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java b/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java index 5168765c434f6..8a632ec6d20f6 100644 --- a/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java +++ b/qa/verify-version-constants/src/test/java/org/elasticsearch/qa/verify_version_constants/VerifyVersionConstantsIT.java @@ -8,6 +8,7 @@ package org.elasticsearch.qa.verify_version_constants; +import org.elasticsearch.Version; import org.elasticsearch.client.Request; import org.elasticsearch.client.Response; import org.elasticsearch.common.settings.SecureString; @@ -21,6 +22,7 @@ import java.text.ParseException; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.Matchers.lessThan; public class VerifyVersionConstantsIT extends ESRestTestCase { @@ -29,11 +31,20 @@ public void testLuceneVersionConstant() throws IOException, ParseException { assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); ObjectPath objectPath = ObjectPath.createFromResponse(response); - String indexVersionString = objectPath.evaluate("version.index_version").toString(); String luceneVersionString = objectPath.evaluate("version.lucene_version").toString(); - - IndexVersion indexVersion = IndexVersion.fromId(Integer.parseInt(indexVersionString)); org.apache.lucene.util.Version luceneVersion = org.apache.lucene.util.Version.parse(luceneVersionString); + + IndexVersion indexVersion; + Object indexVersionString = objectPath.evaluate("version.index_version"); + if (indexVersionString != null) { + indexVersion = IndexVersion.fromId(Integer.parseInt(indexVersionString.toString())); + } else { + String elasticsearchVersionString = objectPath.evaluate("version.number").toString(); + Version elasticsearchVersion = Version.fromString(elasticsearchVersionString.replace("-SNAPSHOT", "")); + assertThat(elasticsearchVersion, lessThan(Version.V_8_10_0)); + indexVersion = IndexVersion.fromId(elasticsearchVersion.id); + } + assertThat(indexVersion.luceneVersion(), equalTo(luceneVersion)); } From c9463a964102916af71a9a1eabb824a786813e1f Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Wed, 5 Jul 2023 11:51:45 +0100 Subject: [PATCH 4/5] Update docs --- docs/reference/setup/install/check-running.asciidoc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/reference/setup/install/check-running.asciidoc b/docs/reference/setup/install/check-running.asciidoc index 3633b81805ca5..8aafb3b494b7c 100644 --- a/docs/reference/setup/install/check-running.asciidoc +++ b/docs/reference/setup/install/check-running.asciidoc @@ -40,9 +40,10 @@ GET / "build_date" : "2016-03-30T09:51:41.449Z", "build_snapshot" : false, "lucene_version" : "{lucene_version}", + "index_version" : "67890", "minimum_wire_compatibility_version" : "1.2.3", "minimum_index_compatibility_version" : "1.2.3", - "transport_version" : "123456" + "transport_version" : "12345" }, "tagline" : "You Know, for Search" } @@ -55,5 +56,6 @@ GET / // TESTRESPONSE[s/"build_snapshot" : false,/"build_snapshot" : $body.version.build_snapshot,/] // TESTRESPONSE[s/"minimum_wire_compatibility_version" : "1.2.3"/"minimum_wire_compatibility_version" : $body.version.minimum_wire_compatibility_version/] // TESTRESPONSE[s/"minimum_index_compatibility_version" : "1.2.3"/"minimum_index_compatibility_version" : $body.version.minimum_index_compatibility_version/] -// TESTRESPONSE[s/"transport_version" : "123456"/"transport_version" : $body.version.transport_version/] +// TESTRESPONSE[s/"transport_version" : "12345"/"transport_version" : $body.version.transport_version/] +// TESTRESPONSE[s/"index_version" : "67890"/"index_version" : $body.version.index_version/] // So much s/// but at least we test that the layout is close to matching.... From b559e6dcb94e23a07741943ab9e3a7d28f0a955a Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Fri, 7 Jul 2023 09:05:37 +0100 Subject: [PATCH 5/5] Undo changes to unrelated fields --- .../org/elasticsearch/rest/root/MainResponse.java | 14 ++------------ .../elasticsearch/rest/root/MainResponseTests.java | 4 ++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainResponse.java b/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainResponse.java index 0f51866554f6e..f5845c85253b7 100644 --- a/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainResponse.java +++ b/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainResponse.java @@ -119,16 +119,6 @@ private String getLuceneVersion() { } } - private String getMinimumWireCompatibilityVersion() { - // this is no longer computed from Version - return TransportVersion.current().equals(transportVersion) ? TransportVersion.MINIMUM_COMPATIBLE.toString() : "unknown"; - } - - private String getMinimumIndexCompatibilityVersion() { - // this is no longer computed from Version - return IndexVersion.current().equals(indexVersion) ? IndexVersion.MINIMUM_COMPATIBLE.toString() : "unknown"; - } - @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); @@ -144,8 +134,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws .field("build_snapshot", build.isSnapshot()) .field("lucene_version", getLuceneVersion()) .field("index_version", indexVersion != null ? indexVersion.toString() : "unknown") - .field("minimum_wire_compatibility_version", getMinimumWireCompatibilityVersion()) - .field("minimum_index_compatibility_version", getMinimumIndexCompatibilityVersion()) + .field("minimum_wire_compatibility_version", version.minimumCompatibilityVersion().toString()) + .field("minimum_index_compatibility_version", version.minimumIndexCompatibilityVersion().toString()) .field("transport_version", transportVersion != null ? transportVersion.toString() : "unknown") .endObject(); builder.field("tagline", "You Know, for Search"); diff --git a/modules/rest-root/src/test/java/org/elasticsearch/rest/root/MainResponseTests.java b/modules/rest-root/src/test/java/org/elasticsearch/rest/root/MainResponseTests.java index 8d745aa39c764..0773fd3187925 100644 --- a/modules/rest-root/src/test/java/org/elasticsearch/rest/root/MainResponseTests.java +++ b/modules/rest-root/src/test/java/org/elasticsearch/rest/root/MainResponseTests.java @@ -103,8 +103,8 @@ public void testToXContent() throws IOException { current.isSnapshot(), indexVersion.luceneVersion().toString(), indexVersion.toString(), - TransportVersion.MINIMUM_COMPATIBLE.toString(), - IndexVersion.MINIMUM_COMPATIBLE.toString(), + version.minimumCompatibilityVersion().toString(), + version.minimumIndexCompatibilityVersion().toString(), transportVersion.toString() ) ),