diff --git a/build.gradle b/build.gradle index 14419937ea9ca..8da09454e78c9 100644 --- a/build.gradle +++ b/build.gradle @@ -475,17 +475,6 @@ allprojects { } } -// TODO: remove this once 7.7 is released and the 7.x branch is 7.8 -subprojects { - pluginManager.withPlugin('elasticsearch.testclusters') { - testClusters.all { - if (org.elasticsearch.gradle.info.BuildParams.isSnapshotBuild() == false) { - systemProperty 'es.datastreams_feature_enabled', 'true' - } - } - } -} - subprojects { project.ext.disableTasks = { String... tasknames -> for (String taskname : tasknames) { diff --git a/server/build.gradle b/server/build.gradle index 5e30b1e3f5bce..a0bf5e4308bf1 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -1,5 +1,3 @@ -import org.elasticsearch.gradle.info.BuildParams - /* * Licensed to Elasticsearch under one or more contributor * license agreements. See the NOTICE file distributed with @@ -296,9 +294,3 @@ licenseHeaders { // Ignore our vendored version of Google Guice excludes << 'org/elasticsearch/common/inject/**/*' } - -tasks.named('internalClusterTest').configure { - if (org.elasticsearch.gradle.info.BuildParams.isSnapshotBuild() == false) { - systemProperty 'es.datastreams_feature_enabled', 'true' - } -} diff --git a/server/src/main/java/org/elasticsearch/action/ActionModule.java b/server/src/main/java/org/elasticsearch/action/ActionModule.java index a950e7a83a940..76a354cc2e8fb 100644 --- a/server/src/main/java/org/elasticsearch/action/ActionModule.java +++ b/server/src/main/java/org/elasticsearch/action/ActionModule.java @@ -21,7 +21,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.Build; import org.elasticsearch.action.admin.cluster.allocation.ClusterAllocationExplainAction; import org.elasticsearch.action.admin.cluster.allocation.TransportClusterAllocationExplainAction; import org.elasticsearch.action.admin.cluster.configuration.AddVotingConfigExclusionsAction; @@ -415,21 +414,6 @@ public class ActionModule extends AbstractModule { private static final Logger logger = LogManager.getLogger(ActionModule.class); - public static final boolean DATASTREAMS_FEATURE_ENABLED; - - static { - final String property = System.getProperty("es.datastreams_feature_enabled"); - if (Build.CURRENT.isSnapshot() || "true".equals(property)) { - DATASTREAMS_FEATURE_ENABLED = true; - } else if ("false".equals(property) || property == null) { - DATASTREAMS_FEATURE_ENABLED = false; - } else { - throw new IllegalArgumentException( - "expected es.datastreams_feature_enabled to be unset or [true|false] but was [" + property + "]" - ); - } - } - private final Settings settings; private final IndexNameExpressionResolver indexNameExpressionResolver; private final IndexScopedSettings indexScopedSettings; @@ -616,13 +600,11 @@ public void reg actionPlugins.stream().flatMap(p -> p.getActions().stream()).forEach(actions::register); // Data streams: - if (DATASTREAMS_FEATURE_ENABLED) { - actions.register(CreateDataStreamAction.INSTANCE, CreateDataStreamAction.TransportAction.class); - actions.register(DeleteDataStreamAction.INSTANCE, DeleteDataStreamAction.TransportAction.class); - actions.register(GetDataStreamAction.INSTANCE, GetDataStreamAction.TransportAction.class); - actions.register(ResolveIndexAction.INSTANCE, ResolveIndexAction.TransportAction.class); - actions.register(DataStreamsStatsAction.INSTANCE, DataStreamsStatsAction.TransportAction.class); - } + actions.register(CreateDataStreamAction.INSTANCE, CreateDataStreamAction.TransportAction.class); + actions.register(DeleteDataStreamAction.INSTANCE, DeleteDataStreamAction.TransportAction.class); + actions.register(GetDataStreamAction.INSTANCE, GetDataStreamAction.TransportAction.class); + actions.register(ResolveIndexAction.INSTANCE, ResolveIndexAction.TransportAction.class); + actions.register(DataStreamsStatsAction.INSTANCE, DataStreamsStatsAction.TransportAction.class); // Persistent tasks: actions.register(StartPersistentTaskAction.INSTANCE, StartPersistentTaskAction.TransportAction.class); @@ -793,13 +775,11 @@ public void initRestHandlers(Supplier nodesInCluster) { registerHandler.accept(new RestDeleteDanglingIndexAction()); // Data Stream API - if (DATASTREAMS_FEATURE_ENABLED) { - registerHandler.accept(new RestCreateDataStreamAction()); - registerHandler.accept(new RestDeleteDataStreamAction()); - registerHandler.accept(new RestGetDataStreamsAction()); - registerHandler.accept(new RestResolveIndexAction()); - registerHandler.accept(new RestDataStreamsStatsAction()); - } + registerHandler.accept(new RestCreateDataStreamAction()); + registerHandler.accept(new RestDeleteDataStreamAction()); + registerHandler.accept(new RestGetDataStreamsAction()); + registerHandler.accept(new RestResolveIndexAction()); + registerHandler.accept(new RestDataStreamsStatsAction()); // CAT API registerHandler.accept(new RestAllocationAction()); diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java index 8fd10b0acf1b6..b96625b6a6377 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java @@ -23,7 +23,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.action.ActionModule; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.admin.indices.datastream.DeleteDataStreamAction; import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse; @@ -136,7 +135,7 @@ public void assertAfterTest() throws IOException { */ public void wipeAllDataStreams() { // Feature flag may not be enabled in all gradle modules that use ESIntegTestCase - if (size() > 0 && ActionModule.DATASTREAMS_FEATURE_ENABLED) { + if (size() > 0) { AcknowledgedResponse response = client().admin().indices().deleteDataStream(new DeleteDataStreamAction.Request(new String[]{"*"})).actionGet(); assertAcked(response); diff --git a/x-pack/plugin/data-streams/build.gradle b/x-pack/plugin/data-streams/build.gradle index 1a4bed892fbb8..bf8169c8c52f7 100644 --- a/x-pack/plugin/data-streams/build.gradle +++ b/x-pack/plugin/data-streams/build.gradle @@ -1,5 +1,3 @@ -import org.elasticsearch.gradle.info.BuildParams - evaluationDependsOn(xpackModule('core')) apply plugin: 'elasticsearch.esplugin' @@ -13,17 +11,6 @@ esplugin { archivesBaseName = 'x-pack-data-streams' integTest.enabled = false -tasks.named('internalClusterTest').configure { - if (BuildParams.isSnapshotBuild() == false) { - systemProperty 'es.datastreams_feature_enabled', 'true' - } -} -tasks.named('test').configure { - if (org.elasticsearch.gradle.info.BuildParams.isSnapshotBuild() == false) { - systemProperty 'es.datastreams_feature_enabled', 'true' - } -} - dependencies { compileOnly project(path: xpackModule('core'), configuration: 'default') testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts') diff --git a/x-pack/plugin/data-streams/src/main/java/org/elasticsearch/xpack/datastreams/DataStreamsPlugin.java b/x-pack/plugin/data-streams/src/main/java/org/elasticsearch/xpack/datastreams/DataStreamsPlugin.java index d179c87de340b..2433d482e5369 100644 --- a/x-pack/plugin/data-streams/src/main/java/org/elasticsearch/xpack/datastreams/DataStreamsPlugin.java +++ b/x-pack/plugin/data-streams/src/main/java/org/elasticsearch/xpack/datastreams/DataStreamsPlugin.java @@ -20,17 +20,11 @@ import java.util.List; import java.util.Map; -import static org.elasticsearch.action.ActionModule.DATASTREAMS_FEATURE_ENABLED; - public class DataStreamsPlugin extends Plugin implements ActionPlugin, MapperPlugin { @Override public Map getMetadataMappers() { - if (DATASTREAMS_FEATURE_ENABLED) { - return Map.of(DataStreamTimestampFieldMapper.NAME, new DataStreamTimestampFieldMapper.TypeParser()); - } else { - return Map.of(); - } + return Map.of(DataStreamTimestampFieldMapper.NAME, new DataStreamTimestampFieldMapper.TypeParser()); } @Override diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/ClassificationIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/ClassificationIT.java index 1c89cba1b08f6..f548203920856 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/ClassificationIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/ClassificationIT.java @@ -8,7 +8,6 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchStatusException; -import org.elasticsearch.action.ActionModule; import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; import org.elasticsearch.action.bulk.BulkRequestBuilder; @@ -145,7 +144,6 @@ public void testSingleNumericFeatureAndMixedTrainingAndNonTrainingRows() throws } public void testWithDatastreams() throws Exception { - assumeTrue("should only run if data streams are enabled", ActionModule.DATASTREAMS_FEATURE_ENABLED); initialize("classification_with_datastreams", true); String predictedClassField = KEYWORD_FIELD + "_prediction"; indexData(sourceIndex, 300, 50, KEYWORD_FIELD); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsIT.java index 1ca465740dd0e..e5c3645d601ae 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsIT.java @@ -7,7 +7,6 @@ import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.Version; -import org.elasticsearch.action.ActionModule; import org.elasticsearch.action.admin.cluster.node.hotthreads.NodeHotThreads; import org.elasticsearch.action.admin.cluster.node.hotthreads.NodesHotThreadsResponse; import org.elasticsearch.action.support.master.AcknowledgedResponse; @@ -101,7 +100,6 @@ public void testLookbackOnly() throws Exception { } public void testLookbackOnlyDataStream() throws Exception { - assumeTrue("should only run if data streams are enabled", ActionModule.DATASTREAMS_FEATURE_ENABLED); String mapping = "{\n" + " \"properties\": {\n" + " \"time\": {\n" + diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/RegressionIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/RegressionIT.java index 6a0efd2ba9362..8c5bf979aaeb4 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/RegressionIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/RegressionIT.java @@ -6,7 +6,6 @@ package org.elasticsearch.xpack.ml.integration; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.action.ActionModule; import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; @@ -397,7 +396,6 @@ public void testDependentVariableIsLong() throws Exception { } public void testWithDatastream() throws Exception { - assumeTrue("should only run if data streams are enabled", ActionModule.DATASTREAMS_FEATURE_ENABLED); initialize("regression_with_datastream"); String predictedClassField = DEPENDENT_VARIABLE_FIELD + "_prediction"; indexData(sourceIndex, 300, 50, true); diff --git a/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/transform/integration/TransformPivotRestIT.java b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/transform/integration/TransformPivotRestIT.java index 35972030cb83e..13b56259ce51f 100644 --- a/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/transform/integration/TransformPivotRestIT.java +++ b/x-pack/plugin/transform/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/transform/integration/TransformPivotRestIT.java @@ -8,7 +8,6 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.elasticsearch.action.ActionModule; import org.elasticsearch.client.Request; import org.elasticsearch.client.ResponseException; import org.elasticsearch.common.Strings; @@ -97,7 +96,6 @@ public void testSimplePivot() throws Exception { } public void testSimpleDataStreamPivot() throws Exception { - assumeTrue("should only run if data streams are enabled", ActionModule.DATASTREAMS_FEATURE_ENABLED); String indexName = "reviews_data_stream"; createReviewsIndex(indexName, 1000, "date", true); String transformId = "simple_data_stream_pivot";