Clean up factory retention settings from elasticsearch (elastic#114396)

This removes the possibility for a plugin to provide factory retention settings. Factory retention settings have been deprecated and completely replaced by elastic#111972.

Note: this feature is not in use. If someone wants to set global retention they can use the cluster settings as defined in elastic#111972.

Author: gmarouli

modules/data-streams/src/test/java/org/elasticsearch/datastreams/MetadataIndexTemplateServiceTests.java

@@ -13,7 +13,6 @@
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.ComponentTemplate;
 import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
-import org.elasticsearch.cluster.metadata.DataStreamFactoryRetention;
 import org.elasticsearch.cluster.metadata.DataStreamGlobalRetentionSettings;
 import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
 import org.elasticsearch.cluster.metadata.MetadataCreateIndexService;
@@ -217,10 +216,7 @@ private MetadataIndexTemplateService getMetadataIndexTemplateService() {
             xContentRegistry(),
             EmptySystemIndices.INSTANCE,
             indexSettingProviders,
-            DataStreamGlobalRetentionSettings.create(
-                ClusterSettings.createBuiltInClusterSettings(),
-                DataStreamFactoryRetention.emptyFactoryRetention()
-            )
+            DataStreamGlobalRetentionSettings.create(ClusterSettings.createBuiltInClusterSettings())
         );
     }
 

modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/TransportGetDataStreamsActionTests.java

@@ -12,7 +12,6 @@
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.DataStream;
-import org.elasticsearch.cluster.metadata.DataStreamFactoryRetention;
 import org.elasticsearch.cluster.metadata.DataStreamGlobalRetention;
 import org.elasticsearch.cluster.metadata.DataStreamGlobalRetentionSettings;
 import org.elasticsearch.cluster.metadata.DataStreamTestHelper;
@@ -47,8 +46,7 @@ public class TransportGetDataStreamsActionTests extends ESTestCase {
     private final IndexNameExpressionResolver resolver = TestIndexNameExpressionResolver.newInstance();
     private final SystemIndices systemIndices = new SystemIndices(List.of());
     private final DataStreamGlobalRetentionSettings dataStreamGlobalRetentionSettings = DataStreamGlobalRetentionSettings.create(
-        ClusterSettings.createBuiltInClusterSettings(),
-        DataStreamFactoryRetention.emptyFactoryRetention()
+        ClusterSettings.createBuiltInClusterSettings()
     );
 
     public void testGetDataStream() {
@@ -356,8 +354,7 @@ public void testPassingGlobalRetention() {
                     )
                     .put(DataStreamGlobalRetentionSettings.DATA_STREAMS_MAX_RETENTION_SETTING.getKey(), globalRetention.maxRetention())
                     .build()
-            ),
-            DataStreamFactoryRetention.emptyFactoryRetention()
+            )
         );
         response = TransportGetDataStreamsAction.innerOperation(
             state,

modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceTests.java

@@ -37,7 +37,6 @@
 import org.elasticsearch.cluster.block.ClusterBlock;
 import org.elasticsearch.cluster.block.ClusterBlocks;
 import org.elasticsearch.cluster.metadata.DataStream;
-import org.elasticsearch.cluster.metadata.DataStreamFactoryRetention;
 import org.elasticsearch.cluster.metadata.DataStreamGlobalRetentionSettings;
 import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
 import org.elasticsearch.cluster.metadata.DataStreamLifecycle.Downsampling;
@@ -142,8 +141,7 @@ public class DataStreamLifecycleServiceTests extends ESTestCase {
     private DoExecuteDelegate clientDelegate;
     private ClusterService clusterService;
     private final DataStreamGlobalRetentionSettings globalRetentionSettings = DataStreamGlobalRetentionSettings.create(
-        ClusterSettings.createBuiltInClusterSettings(),
-        DataStreamFactoryRetention.emptyFactoryRetention()
+        ClusterSettings.createBuiltInClusterSettings()
     );
 
     @Before

server/src/main/java/module-info.java

@@ -416,7 +416,6 @@
     uses org.elasticsearch.internal.BuildExtension;
     uses org.elasticsearch.features.FeatureSpecification;
     uses org.elasticsearch.plugins.internal.LoggingDataProvider;
-    uses org.elasticsearch.cluster.metadata.DataStreamFactoryRetention;
 
     provides org.elasticsearch.features.FeatureSpecification
         with

server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamFactoryRetention.java

@@ -26,8 +26,6 @@
  * The global retention settings apply to non-system data streams that are managed by the data stream lifecycle. They consist of:
  * - The default retention which applies to data streams that do not have a retention defined.
  * - The max retention which applies to all data streams that do not have retention or their retention has exceeded this value.
- * <p>
- * Temporarily, we fall back to {@link DataStreamFactoryRetention} to facilitate a smooth transition to these settings.
  */
 public class DataStreamGlobalRetentionSettings {
 
@@ -84,42 +82,35 @@ public Iterator<Setting<?>> settings() {
         Setting.Property.Dynamic
     );
 
-    private final DataStreamFactoryRetention factoryRetention;
-
     @Nullable
     private volatile TimeValue defaultRetention;
     @Nullable
     private volatile TimeValue maxRetention;
 
-    private DataStreamGlobalRetentionSettings(DataStreamFactoryRetention factoryRetention) {
-        this.factoryRetention = factoryRetention;
+    private DataStreamGlobalRetentionSettings() {
+
     }
 
     @Nullable
     public TimeValue getMaxRetention() {
-        return shouldFallbackToFactorySettings() ? factoryRetention.getMaxRetention() : maxRetention;
+        return maxRetention;
     }
 
     @Nullable
     public TimeValue getDefaultRetention() {
-        return shouldFallbackToFactorySettings() ? factoryRetention.getDefaultRetention() : defaultRetention;
+        return defaultRetention;
     }
 
     public boolean areDefined() {
         return getDefaultRetention() != null || getMaxRetention() != null;
     }
 
-    private boolean shouldFallbackToFactorySettings() {
-        return defaultRetention == null && maxRetention == null;
-    }
-
     /**
      * Creates an instance and initialises the cluster settings listeners
      * @param clusterSettings it will register the cluster settings listeners to monitor for changes
-     * @param factoryRetention for migration purposes, it will be removed shortly
      */
-    public static DataStreamGlobalRetentionSettings create(ClusterSettings clusterSettings, DataStreamFactoryRetention factoryRetention) {
-        DataStreamGlobalRetentionSettings dataStreamGlobalRetentionSettings = new DataStreamGlobalRetentionSettings(factoryRetention);
+    public static DataStreamGlobalRetentionSettings create(ClusterSettings clusterSettings) {
+        DataStreamGlobalRetentionSettings dataStreamGlobalRetentionSettings = new DataStreamGlobalRetentionSettings();
         clusterSettings.initializeAndWatch(DATA_STREAMS_DEFAULT_RETENTION_SETTING, dataStreamGlobalRetentionSettings::setDefaultRetention);
         clusterSettings.initializeAndWatch(DATA_STREAMS_MAX_RETENTION_SETTING, dataStreamGlobalRetentionSettings::setMaxRetention);
         return dataStreamGlobalRetentionSettings;

server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamGlobalRetentionSettings.java

@@ -44,7 +44,6 @@
 import org.elasticsearch.cluster.coordination.MasterHistoryService;
 import org.elasticsearch.cluster.coordination.StableMasterHealthIndicatorService;
 import org.elasticsearch.cluster.features.NodeFeaturesFixupListener;
-import org.elasticsearch.cluster.metadata.DataStreamFactoryRetention;
 import org.elasticsearch.cluster.metadata.DataStreamGlobalRetentionSettings;
 import org.elasticsearch.cluster.metadata.IndexMetadataVerifier;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
@@ -621,8 +620,7 @@ private DataStreamGlobalRetentionSettings createDataStreamServicesAndGlobalReten
         MetadataCreateIndexService metadataCreateIndexService
     ) {
         DataStreamGlobalRetentionSettings dataStreamGlobalRetentionSettings = DataStreamGlobalRetentionSettings.create(
-            clusterService.getClusterSettings(),
-            DataStreamFactoryRetention.load(pluginsService, clusterService.getClusterSettings())
+            clusterService.getClusterSettings()
         );
         modules.bindToInstance(DataStreamGlobalRetentionSettings.class, dataStreamGlobalRetentionSettings);
         modules.bindToInstance(

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

@@ -18,7 +18,6 @@
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
-import org.elasticsearch.cluster.metadata.DataStreamFactoryRetention;
 import org.elasticsearch.cluster.metadata.DataStreamGlobalRetentionSettings;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.Metadata;
@@ -94,10 +93,7 @@ public void setup() throws IOException {
         doReturn(mapperService).when(indexService).mapperService();
         doReturn(indexService).when(indicesService).createIndex(any(), any(), anyBoolean());
 
-        globalRetentionSettings = DataStreamGlobalRetentionSettings.create(
-            ClusterSettings.createBuiltInClusterSettings(),
-            DataStreamFactoryRetention.emptyFactoryRetention()
-        );
+        globalRetentionSettings = DataStreamGlobalRetentionSettings.create(ClusterSettings.createBuiltInClusterSettings());
         templateService = new MetadataIndexTemplateService(
             clusterService,
             mock(MetadataCreateIndexService.class),

server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java

@@ -22,46 +22,16 @@ public class DataStreamGlobalRetentionSettingsTests extends ESTestCase {
 
     public void testDefaults() {
         DataStreamGlobalRetentionSettings globalRetentionSettings = DataStreamGlobalRetentionSettings.create(
-            ClusterSettings.createBuiltInClusterSettings(),
-            DataStreamFactoryRetention.emptyFactoryRetention()
+            ClusterSettings.createBuiltInClusterSettings()
         );
 
         assertThat(globalRetentionSettings.getDefaultRetention(), nullValue());
         assertThat(globalRetentionSettings.getMaxRetention(), nullValue());
-
-        // Fallback to factory settings
-        TimeValue maxFactoryValue = randomPositiveTimeValue();
-        TimeValue defaultFactoryValue = randomPositiveTimeValue();
-        DataStreamGlobalRetentionSettings withFactorySettings = DataStreamGlobalRetentionSettings.create(
-            ClusterSettings.createBuiltInClusterSettings(),
-            new DataStreamFactoryRetention() {
-                @Override
-                public TimeValue getMaxRetention() {
-                    return maxFactoryValue;
-                }
-
-                @Override
-                public TimeValue getDefaultRetention() {
-                    return defaultFactoryValue;
-                }
-
-                @Override
-                public void init(ClusterSettings clusterSettings) {
-
-                }
-            }
-        );
-
-        assertThat(withFactorySettings.getDefaultRetention(), equalTo(defaultFactoryValue));
-        assertThat(withFactorySettings.getMaxRetention(), equalTo(maxFactoryValue));
     }
 
     public void testMonitorsDefaultRetention() {
         ClusterSettings clusterSettings = ClusterSettings.createBuiltInClusterSettings();
-        DataStreamGlobalRetentionSettings globalRetentionSettings = DataStreamGlobalRetentionSettings.create(
-            clusterSettings,
-            DataStreamFactoryRetention.emptyFactoryRetention()
-        );
+        DataStreamGlobalRetentionSettings globalRetentionSettings = DataStreamGlobalRetentionSettings.create(clusterSettings);
 
         // Test valid update
         TimeValue newDefaultRetention = TimeValue.timeValueDays(randomIntBetween(1, 10));
@@ -91,10 +61,7 @@ public void testMonitorsDefaultRetention() {
 
     public void testMonitorsMaxRetention() {
         ClusterSettings clusterSettings = ClusterSettings.createBuiltInClusterSettings();
-        DataStreamGlobalRetentionSettings globalRetentionSettings = DataStreamGlobalRetentionSettings.create(
-            clusterSettings,
-            DataStreamFactoryRetention.emptyFactoryRetention()
-        );
+        DataStreamGlobalRetentionSettings globalRetentionSettings = DataStreamGlobalRetentionSettings.create(clusterSettings);
 
         // Test valid update
         TimeValue newMaxRetention = TimeValue.timeValueDays(randomIntBetween(10, 30));
@@ -121,7 +88,7 @@ public void testMonitorsMaxRetention() {
 
     public void testCombinationValidation() {
         ClusterSettings clusterSettings = ClusterSettings.createBuiltInClusterSettings();
-        DataStreamGlobalRetentionSettings.create(clusterSettings, DataStreamFactoryRetention.emptyFactoryRetention());
+        DataStreamGlobalRetentionSettings.create(clusterSettings);
 
         // Test invalid update
         Settings newInvalidSettings = Settings.builder()

server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamGlobalRetentionSettingsTests.java

@@ -141,10 +141,7 @@ public void testUpdatingLifecycleOnADataStream() {
         MetadataDataStreamsService metadataDataStreamsService = new MetadataDataStreamsService(
             mock(ClusterService.class),
             mock(IndicesService.class),
-            DataStreamGlobalRetentionSettings.create(
-                ClusterSettings.createBuiltInClusterSettings(settingsWithDefaultRetention),
-                DataStreamFactoryRetention.emptyFactoryRetention()
-            )
+            DataStreamGlobalRetentionSettings.create(ClusterSettings.createBuiltInClusterSettings(settingsWithDefaultRetention))
         );
 
         ClusterState after = metadataDataStreamsService.updateDataLifecycle(before, List.of(dataStream), DataStreamLifecycle.DEFAULT);
@@ -281,10 +278,7 @@ public void testValidateLifecycleInComponentTemplate() throws Exception {
             xContentRegistry(),
             EmptySystemIndices.INSTANCE,
             new IndexSettingProviders(Set.of()),
-            DataStreamGlobalRetentionSettings.create(
-                ClusterSettings.createBuiltInClusterSettings(settingsWithDefaultRetention),
-                DataStreamFactoryRetention.emptyFactoryRetention()
-            )
+            DataStreamGlobalRetentionSettings.create(ClusterSettings.createBuiltInClusterSettings(settingsWithDefaultRetention))
         );
 
         ThreadContext threadContext = new ThreadContext(Settings.EMPTY);