Skip to content

[8.x] Rewire 8.19 backport constants to avoid conflicts with 8.18 backport constants #122580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ldematte merged 5 commits into from
Feb 17, 2025
Merged

[8.x] Rewire 8.19 backport constants to avoid conflicts with 8.18 backport constants #122580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcbb30e
Rewire 8.19 backport constants to avoid conflicts with 8.18 backport …
ldematte Feb 14, 2025
e1d65c9
Renaming
ldematte Feb 14, 2025
22685df
Merge branch '8.x' into backport/8.x/fix-8-19-transport-versions
ldematte Feb 14, 2025
dd034b8
Merge remote-tracking branch 'upstream/8.x' into backport/8.x/fix-8-1…
ldematte Feb 17, 2025
f2502a4
Merge branch 'backport/8.x/fix-8-19-transport-versions' of github.com…
ldematte Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,11 @@ 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 COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED_BACKPORT_8_X = def(8_840_0_01);
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_X = def(8_840_0_02);
public static final TransportVersion ESQL_RETRY_ON_SHARD_LEVEL_FAILURE_BACKPORT_8_19 = def(8_840_0_03);
public static final TransportVersion ESQL_SUPPORT_PARTIAL_RESULTS_BACKPORT_8_19 = def(8_840_0_04);
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19 = def(8_841_0_00);
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED_BACKPORT_8_X = def(8_841_0_01);
Copy link
Member

@rjernst rjernst Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separately (it can be in a followup) we should rename these constants. Using _X suffix isn't descriptive enough, ever, because whatever branch it is backported to will become a release branch. So this should always be the exact minor version that is backported to.

public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_X = def(8_841_0_02);
public static final TransportVersion ESQL_RETRY_ON_SHARD_LEVEL_FAILURE_BACKPORT_8_19 = def(8_841_0_03);
public static final TransportVersion ESQL_SUPPORT_PARTIAL_RESULTS_BACKPORT_8_19 = def(8_841_0_04);

/*
* STOP! READ THIS FIRST! No, really,
Expand Down
6 changes: 4 additions & 2 deletions server/src/test/java/org/elasticsearch/TransportVersionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
public class TransportVersionTests extends ESTestCase {

/**
* This test is specific for 8.19, to ensure that transport versions are backported correctly. Do not forward or backport it.
* This test is specific for 8.19, to ensure that transport versions are backported correctly. Do not forward or backport it,
* and do not adjust the TransportVersion to check (INITIAL_ELASTICSEARCH_8_19).
* If the test fails, there is something wrong with your backport PR.
*/
public void testMaximumAllowedTransportVersion() {
assertThat(TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.ML_INFERENCE_IBM_WATSONX_RERANK_ADDED), is(true));
assertThat(TransportVersions.LATEST_DEFINED.isPatchFrom(TransportVersions.INITIAL_ELASTICSEARCH_8_19), is(true));
}

public void testVersionComparison() {
Expand Down