From bb6be479c05cb58cc0504c8055cbc74d4b926d56 Mon Sep 17 00:00:00 2001 From: Lorenzo Dematte Date: Fri, 14 Feb 2025 10:39:50 +0100 Subject: [PATCH 1/2] Add 8.19 transport version constant to keep branches aligned --- server/src/main/java/org/elasticsearch/TransportVersions.java | 1 + .../test/java/org/elasticsearch/TransportVersionTests.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index 18c0d9c4904f5..5ecfa19ae6b28 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -172,6 +172,7 @@ static TransportVersion def(int id) { public static final TransportVersion TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER = def(8_838_0_00); public static final TransportVersion INFERENCE_REQUEST_ADAPTIVE_RATE_LIMITING = def(8_839_0_00); public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00); + public static final TransportVersion ELASTICSEARCH_8_19 = def(8_841_0_00); public static final TransportVersion ELASTICSEARCH_9_0 = def(9_000_0_00); public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01); public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02); diff --git a/server/src/test/java/org/elasticsearch/TransportVersionTests.java b/server/src/test/java/org/elasticsearch/TransportVersionTests.java index 5b07fc50b13ba..c4d3170ec28b1 100644 --- a/server/src/test/java/org/elasticsearch/TransportVersionTests.java +++ b/server/src/test/java/org/elasticsearch/TransportVersionTests.java @@ -28,7 +28,9 @@ public class TransportVersionTests extends ESTestCase { /** - * This test is specific for V9, to ensure that transport versions are backported correctly. + * This test is specific for V9, to ensure that transport versions are backported correctly. Do not forward or backport it, + * and do not adjust the TransportVersion to check (ELASTICSEARCH_9_0). + * If the test fails, there is something wrong with your backport PR. */ public void testMaximumAllowedTransportVersion() { assertThat(TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.ELASTICSEARCH_9_0), is(true)); From 9d6f11df03a7ff89621850a31fe6bfabc6d6e966 Mon Sep 17 00:00:00 2001 From: Lorenzo Dematte Date: Fri, 14 Feb 2025 16:13:51 +0100 Subject: [PATCH 2/2] Renaming --- server/src/main/java/org/elasticsearch/TransportVersions.java | 4 ++-- .../test/java/org/elasticsearch/TransportVersionTests.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index 5ecfa19ae6b28..25c44044a9f5b 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -172,8 +172,8 @@ static TransportVersion def(int id) { public static final TransportVersion TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER = def(8_838_0_00); public static final TransportVersion INFERENCE_REQUEST_ADAPTIVE_RATE_LIMITING = def(8_839_0_00); public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00); - public static final TransportVersion ELASTICSEARCH_8_19 = def(8_841_0_00); - public static final TransportVersion ELASTICSEARCH_9_0 = def(9_000_0_00); + public static final TransportVersion INITIAL_ELASTICSEARCH_8_19 = def(8_841_0_00); + public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00); public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01); public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02); public static final TransportVersion REMOVE_DESIRED_NODE_VERSION_90 = def(9_000_0_03); diff --git a/server/src/test/java/org/elasticsearch/TransportVersionTests.java b/server/src/test/java/org/elasticsearch/TransportVersionTests.java index c4d3170ec28b1..3866aaa5ed674 100644 --- a/server/src/test/java/org/elasticsearch/TransportVersionTests.java +++ b/server/src/test/java/org/elasticsearch/TransportVersionTests.java @@ -29,11 +29,11 @@ public class TransportVersionTests extends ESTestCase { /** * This test is specific for V9, to ensure that transport versions are backported correctly. Do not forward or backport it, - * and do not adjust the TransportVersion to check (ELASTICSEARCH_9_0). + * and do not adjust the TransportVersion to check (INITIAL_ELASTICSEARCH_9_0). * If the test fails, there is something wrong with your backport PR. */ public void testMaximumAllowedTransportVersion() { - assertThat(TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.ELASTICSEARCH_9_0), is(true)); + assertThat(TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.INITIAL_ELASTICSEARCH_9_0), is(true)); } public void testVersionComparison() {