Skip to content

Commit 04848b1

Browse files
authored
Claim transport version for backporting ILM skip setting (#128876)
Preparation for backporting #128736.
1 parent d1b5532 commit 04848b1

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ static TransportVersion def(int id) {
188188
public static final TransportVersion IDP_CUSTOM_SAML_ATTRIBUTES_ADDED_8_19 = def(8_841_0_40);
189189
public static final TransportVersion DATA_STREAM_OPTIONS_API_REMOVE_INCLUDE_DEFAULTS_8_19 = def(8_841_0_41);
190190
public static final TransportVersion JOIN_ON_ALIASES_8_19 = def(8_841_0_42);
191+
public static final TransportVersion ILM_ADD_SKIP_SETTING_8_19 = def(8_841_0_43);
191192
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
192193
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
193194
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleExplainResponse.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,8 @@ public IndexLifecycleExplainResponse(StreamInput in) throws IOException {
342342
} else {
343343
previousStepInfo = null;
344344
}
345-
if (in.getTransportVersion().onOrAfter(TransportVersions.ILM_ADD_SKIP_SETTING)) {
345+
if (in.getTransportVersion().isPatchFrom(TransportVersions.ILM_ADD_SKIP_SETTING_8_19)
346+
|| in.getTransportVersion().onOrAfter(TransportVersions.ILM_ADD_SKIP_SETTING)) {
346347
skip = in.readBoolean();
347348
} else {
348349
skip = false;
@@ -397,7 +398,8 @@ public void writeTo(StreamOutput out) throws IOException {
397398
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
398399
out.writeOptionalBytesReference(previousStepInfo);
399400
}
400-
if (out.getTransportVersion().onOrAfter(TransportVersions.ILM_ADD_SKIP_SETTING)) {
401+
if (out.getTransportVersion().isPatchFrom(TransportVersions.ILM_ADD_SKIP_SETTING_8_19)
402+
|| out.getTransportVersion().onOrAfter(TransportVersions.ILM_ADD_SKIP_SETTING)) {
401403
out.writeBoolean(skip);
402404
}
403405
}

0 commit comments

Comments
 (0)