From d9d469111dd5a9f4fbafcead3fbef41a8e302ea9 Mon Sep 17 00:00:00 2001 From: Matt Culbreth Date: Fri, 21 Feb 2025 10:48:22 -0500 Subject: [PATCH 1/5] Remove `@UpdateForV9` as necessary backport has been done --- .../elasticsearch/cluster/metadata/ComposableIndexTemplate.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java index 45433c4cba107..d27f0ecaa5d51 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java @@ -373,8 +373,6 @@ public static class DataStreamTemplate implements Writeable, ToXContentObject { private static final ParseField HIDDEN = new ParseField("hidden"); private static final ParseField ALLOW_CUSTOM_ROUTING = new ParseField("allow_custom_routing"); - // Remove this after this PR gets backported - @UpdateForV9(owner = UpdateForV9.Owner.DATA_MANAGEMENT) private static final ParseField FAILURE_STORE = new ParseField("failure_store"); public static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( From 17a72fb6091dbd1cc791e7768842fa96f9e723f1 Mon Sep 17 00:00:00 2001 From: Matt Culbreth Date: Fri, 21 Feb 2025 12:04:43 -0500 Subject: [PATCH 2/5] Removed `@UpdateForV9` annotation since `?wait_for_active_shards` has been removed --- .../org/elasticsearch/test/rest/ESRestTestCase.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 677924a553ec7..60d114257d2c9 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -1992,19 +1992,9 @@ protected static boolean indexExists(RestClient client, String index) throws IOE return RestStatus.OK.getStatus() == response.getStatusLine().getStatusCode(); } - /** - * Deprecation message emitted since 7.12.0 for the rest of the 7.x series. Can be removed in v9 since it is not - * emitted in v8. Note that this message is also permitted in certain YAML test cases, it can be removed there too. - * See https://github.com/elastic/elasticsearch/issues/66419 for more details. - */ - @UpdateForV9(owner = UpdateForV9.Owner.DATA_MANAGEMENT) - private static final String WAIT_FOR_ACTIVE_SHARDS_DEFAULT_DEPRECATION_MESSAGE = "the default value for the ?wait_for_active_shards " - + "parameter will change from '0' to 'index-setting' in version 8; specify '?wait_for_active_shards=index-setting' " - + "to adopt the future default behaviour, or '?wait_for_active_shards=0' to preserve today's behaviour"; protected static void closeIndex(String index) throws IOException { final Request closeRequest = new Request(HttpPost.METHOD_NAME, "/" + index + "/_close"); - closeRequest.setOptions(expectVersionSpecificWarnings(v -> v.compatible(WAIT_FOR_ACTIVE_SHARDS_DEFAULT_DEPRECATION_MESSAGE))); assertOK(client().performRequest(closeRequest)); } From 9877780464b3ea5fba3d512a554dcfb49595472d Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Fri, 21 Feb 2025 17:16:54 +0000 Subject: [PATCH 3/5] [CI] Auto commit changes from spotless --- .../elasticsearch/cluster/metadata/ComposableIndexTemplate.java | 1 - .../main/java/org/elasticsearch/test/rest/ESRestTestCase.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java index d27f0ecaa5d51..923ce3df1e510 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java @@ -19,7 +19,6 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.core.Nullable; -import org.elasticsearch.core.UpdateForV9; import org.elasticsearch.index.mapper.DataStreamTimestampFieldMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.xcontent.ConstructingObjectParser; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 60d114257d2c9..29e566604c823 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -64,7 +64,6 @@ import org.elasticsearch.core.Nullable; import org.elasticsearch.core.PathUtils; import org.elasticsearch.core.TimeValue; -import org.elasticsearch.core.UpdateForV9; import org.elasticsearch.features.NodeFeature; import org.elasticsearch.health.node.selection.HealthNode; import org.elasticsearch.index.IndexSettings; @@ -1992,7 +1991,6 @@ protected static boolean indexExists(RestClient client, String index) throws IOE return RestStatus.OK.getStatus() == response.getStatusLine().getStatusCode(); } - protected static void closeIndex(String index) throws IOException { final Request closeRequest = new Request(HttpPost.METHOD_NAME, "/" + index + "/_close"); assertOK(client().performRequest(closeRequest)); From c35758f87cfd14a768e03c344d4ae3654270bc7b Mon Sep 17 00:00:00 2001 From: Matt Culbreth Date: Mon, 24 Feb 2025 14:58:34 -0500 Subject: [PATCH 4/5] Change UpdateForV9 to UpdateForV10 for ESRestTestCase due to N-2 support --- .../org/elasticsearch/test/rest/ESRestTestCase.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 60d114257d2c9..490bfbea77fcf 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -64,7 +64,7 @@ import org.elasticsearch.core.Nullable; import org.elasticsearch.core.PathUtils; import org.elasticsearch.core.TimeValue; -import org.elasticsearch.core.UpdateForV9; +import org.elasticsearch.core.UpdateForV10; import org.elasticsearch.features.NodeFeature; import org.elasticsearch.health.node.selection.HealthNode; import org.elasticsearch.index.IndexSettings; @@ -1992,9 +1992,20 @@ protected static boolean indexExists(RestClient client, String index) throws IOE return RestStatus.OK.getStatus() == response.getStatusLine().getStatusCode(); } + /** + * Deprecation message emitted since 7.12.0 for the rest of the 7.x series. Can be removed in v10 since it is not + * emitted in v8 or v9 and N-2 versions are now supported. + * Note that this message is also permitted in certain YAML test cases, it can be removed there too. + * See https://github.com/elastic/elasticsearch/issues/66419 and https://github.com/elastic/elasticsearch/pull/119594 for more details. + */ + @UpdateForV10(owner = UpdateForV10.Owner.DISTRIBUTED_COORDINATION) + private static final String WAIT_FOR_ACTIVE_SHARDS_DEFAULT_DEPRECATION_MESSAGE = "the default value for the ?wait_for_active_shards " + + "parameter will change from '0' to 'index-setting' in version 8; specify '?wait_for_active_shards=index-setting' " + + "to adopt the future default behaviour, or '?wait_for_active_shards=0' to preserve today's behaviour"; protected static void closeIndex(String index) throws IOException { final Request closeRequest = new Request(HttpPost.METHOD_NAME, "/" + index + "/_close"); + closeRequest.setOptions(expectVersionSpecificWarnings(v -> v.compatible(WAIT_FOR_ACTIVE_SHARDS_DEFAULT_DEPRECATION_MESSAGE))); assertOK(client().performRequest(closeRequest)); } From 9e651791c7e186e87c39c36c414021e78f5197a7 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Mon, 24 Feb 2025 20:12:19 +0000 Subject: [PATCH 5/5] [CI] Auto commit changes from spotless --- .../main/java/org/elasticsearch/test/rest/ESRestTestCase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 56898ad8d0f02..490bfbea77fcf 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -1991,7 +1991,7 @@ protected static boolean indexExists(RestClient client, String index) throws IOE Response response = client.performRequest(new Request("HEAD", "/" + index)); return RestStatus.OK.getStatus() == response.getStatusLine().getStatusCode(); } - + /** * Deprecation message emitted since 7.12.0 for the rest of the 7.x series. Can be removed in v10 since it is not * emitted in v8 or v9 and N-2 versions are now supported.