Skip to content

Commit cd6d0e5

Browse files
committed
Cutover to the new transport version system
This commit updates the latest transport version ids to use the new gradle managed system. It also adds a test to ensure new constants are not added to TransportVersions.java.
1 parent c7bc3b7 commit cd6d0e5

File tree

15 files changed

+37
-12
lines changed

15 files changed

+37
-12
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionResourcesTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ private void validateUpperBound(
245245
}
246246

247247
TransportVersionUpperBound existingUpperBound = getResources().get().getUpperBoundFromUpstream(upperBound.name());
248-
if (existingUpperBound != null) {
248+
if (existingUpperBound != null && getShouldValidatePrimaryIdNotPatch().get()) {
249249
if (upperBound.definitionId().patch() != 0 && upperBound.definitionId().base() != existingUpperBound.definitionId().base()) {
250250
throwUpperBoundFailure(
251251
upperBound,

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,16 @@
2020
import java.util.TreeSet;
2121

2222
/**
23-
* <p>Transport version is used to coordinate compatible wire protocol communication between nodes, at a fine-grained level. This replaces
24-
* and supersedes the old Version constants.</p>
23+
* Legacy container for transport version constants.
2524
*
26-
* <p>Before adding a new version constant, please read the block comment at the end of the list of constants.</p>
25+
* ____ ___ _ _ ___ _____ _____ ____ ___ _____ _____ _ _ ___ ____ _____ ___ _ _____
26+
* | _ \ / _ \ | \ | |/ _ \_ _| | ____| _ \_ _|_ _| |_ _| | | |_ _/ ___| | ___|_ _| | | ____|
27+
* | | | | | | | | \| | | | || | | _| | | | | | | | | | | |_| || |\___ \ | |_ | || | | _|
28+
* | |_| | |_| | | |\ | |_| || | | |___| |_| | | | | | | | _ || | ___) | | _| | || |___| |___
29+
* |____/ \___/ |_| \_|\___/ |_| |_____|____/___| |_| |_| |_| |_|___|____/ |_| |___|_____|_____|
30+
*
31+
* DO NOT EDIT THIS FILE! New transport versions should be added using the new transport version system.
32+
* See docs/internal/Versioning.md.
2733
*/
2834
public class TransportVersions {
2935

@@ -170,8 +176,6 @@ static TransportVersion def(int id) {
170176
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00);
171177
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_18 = def(8_840_0_01);
172178
public static final TransportVersion RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_8_18 = def(8_840_0_02);
173-
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_7 = def(8_840_0_09);
174-
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_8 = def(8_840_0_10);
175179
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19 = def(8_841_0_00);
176180
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
177181
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
@@ -183,8 +187,6 @@ static TransportVersion def(int id) {
183187
public static final TransportVersion RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR_90 = def(9_000_0_07);
184188
public static final TransportVersion RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE_90 = def(9_000_0_08);
185189
public static final TransportVersion STORED_SCRIPT_CONTENT_LENGTH_90 = def(9_000_0_09);
186-
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_7 = def(9_000_0_16);
187-
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_8 = def(9_000_0_17);
188190

189191
/*
190192
* STOP! READ THIS FIRST! No, really,
@@ -194,9 +196,9 @@ static TransportVersion def(int id) {
194196
* ___) || || |_| | __/|_| | _ <| |___ / ___ \| |_| | | | | _ || | ___) | | _| | || _ < ___) || | |_|
195197
* |____/ |_| \___/|_| (_) |_| \_\_____/_/ \_\____/ |_| |_| |_|___|____/ |_| |___|_| \_\____/ |_| (_)
196198
*
197-
* A new transport version should be added EVERY TIME a change is made to the serialization protocol of one or more classes. Each
198-
* transport version should only be used in a single merged commit (apart from the BwC versions copied from o.e.Version, ≤V_8_8_1).
199+
* DO NOT EDIT THIS FILE.
199200
*
201+
<<<<<<< HEAD
200202
* ADDING A TRANSPORT VERSION
201203
* To add a new transport version, add a new constant at the bottom of the list, above this comment. Don't add other lines,
202204
* comments, etc. The version id has the following layout:
@@ -237,6 +239,9 @@ static TransportVersion def(int id) {
237239
* git diff v8.11.0..main -- server/src/main/java/org/elasticsearch/TransportVersions.java
238240
*
239241
* In branches 8.7-8.10 see server/src/main/java/org/elasticsearch/TransportVersion.java for the equivalent definitions.
242+
=======
243+
* Transport version must now be added with the new transport version system. See docs/internal/Versioning.md
244+
>>>>>>> c61ab3c5e36 (Cutover to the new transport version system)
240245
*/
241246

242247
/**
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9163000
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9164000
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8840009
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8840010
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8841068
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8841069
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9000016
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9000017

0 commit comments

Comments
 (0)