Skip to content

Harden new tsid hashing transport version #106897

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

Closed
dnhatn wants to merge 1 commit into from
Closed

Harden new tsid hashing transport version #106897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 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 @@ -120,6 +120,7 @@ static TransportVersion def(int id) {
public static final TransportVersion DESIRED_NODE_VERSION_OPTIONAL_STRING = def(8_580_00_0);
public static final TransportVersion ML_INFERENCE_REQUEST_INPUT_TYPE_UNSPECIFIED_ADDED = def(8_581_00_0);
public static final TransportVersion ASYNC_SEARCH_STATUS_SUPPORTS_KEEP_ALIVE = def(8_582_00_0);
public static final TransportVersion TIME_SERIES_ID_HASHING = def(8_582_10_0);
Copy link
Copy Markdown
Contributor

@ldematte ldematte Mar 29, 2024

Choose a reason for hiding this comment

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

You should not use that for a patch version -- those are reserved for serverless.
From the docs a few lines below:

     * M_NNN_SS_P
     *
     * M - The major version of Elasticsearch
     * NNN - The server version part
     * SS - The serverless version part. It should always be 00 here, it is used by serverless only.
     * P - The patch version part

public static final TransportVersion KNN_QUERY_NUMCANDS_AS_OPTIONAL_PARAM = def(8_583_00_0);
public static final TransportVersion TRANSFORM_GET_BASIC_STATS = def(8_584_00_0);
public static final TransportVersion NLP_DOCUMENT_CHUNKING_ADDED = def(8_585_00_0);
Expand Down
5 changes: 2 additions & 3 deletions ...ownsample/src/main/java/org/elasticsearch/xpack/downsample/DownsampleShardTaskParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public record DownsampleShardTaskParams(
String[] dimensions
) implements PersistentTaskParams {

private static final TransportVersion V_8_13_0 = TransportVersions.ML_MODEL_IN_SERVICE_SETTINGS;
public static final String NAME = DownsampleShardTask.TASK_NAME;
private static final ParseField DOWNSAMPLE_CONFIG = new ParseField("downsample_config");
private static final ParseField DOWNSAMPLE_INDEX = new ParseField("rollup_index");
Expand Down Expand Up @@ -73,7 +72,7 @@ public record DownsampleShardTaskParams(
new ShardId(in),
in.readStringArray(),
in.readStringArray(),
in.getTransportVersion().onOrAfter(V_8_13_0) ? in.readOptionalStringArray() : new String[] {}
in.getTransportVersion().onOrAfter(TransportVersions.TIME_SERIES_ID_HASHING) ? in.readOptionalStringArray() : new String[] {}
);
}

Expand Down Expand Up @@ -112,7 +111,7 @@ public void writeTo(StreamOutput out) throws IOException {
shardId.writeTo(out);
out.writeStringArray(metrics);
out.writeStringArray(labels);
if (out.getTransportVersion().onOrAfter(V_8_13_0)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.TIME_SERIES_ID_HASHING)) {
out.writeOptionalStringArray(dimensions);
}
}
Expand Down