Adding integ settings and correcting the flow to contain only enabled…

… setting at cluster level Signed-off-by: Bharathwaj G <[email protected]>
opensearch-project · Jun 6, 2024 · 64b3559 · 64b3559
1 parent bc9c3dc
commit 64b3559
Show file tree

Hide file tree

Showing 18 changed files with 1,025 additions and 457 deletions.
diff --git a/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java b/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java
@@ -113,7 +113,6 @@
 import org.opensearch.index.ShardIndexingPressureMemoryManager;
 import org.opensearch.index.ShardIndexingPressureSettings;
 import org.opensearch.index.ShardIndexingPressureStore;
-import org.opensearch.index.compositeindex.CompositeIndexSettings;
 import org.opensearch.index.remote.RemoteStorePressureSettings;
 import org.opensearch.index.remote.RemoteStoreStatsTrackerFactory;
 import org.opensearch.index.store.remote.filecache.FileCacheSettings;
@@ -744,13 +743,8 @@ public void apply(Settings value, Settings current, Settings previous) {
                 RemoteStoreSettings.CLUSTER_REMOTE_MAX_TRANSLOG_READERS,
                 RemoteStoreSettings.CLUSTER_REMOTE_STORE_TRANSLOG_METADATA,
 
-                // Composite index settings
-                CompositeIndexSettings.COMPOSITE_INDEX_ENABLED_SETTING,
-                CompositeIndexSettings.COMPOSITE_INDEX_MAX_FIELDS_SETTING,
-                CompositeIndexSettings.COMPOSITE_INDEX_MAX_DIMENSIONS_SETTING,
-                CompositeIndexSettings.STAR_TREE_DEFAULT_MAX_LEAF_DOCS,
-                CompositeIndexSettings.DEFAULT_METRICS_LIST,
-                CompositeIndexSettings.DEFAULT_DATE_INTERVALS
+                // Composite index setting
+                IndicesService.COMPOSITE_INDEX_ENABLED_SETTING
             )
         )
     );

diff --git a/server/src/main/java/org/opensearch/common/settings/IndexScopedSettings.java b/server/src/main/java/org/opensearch/common/settings/IndexScopedSettings.java
@@ -51,6 +51,7 @@
 import org.opensearch.index.SearchSlowLog;
 import org.opensearch.index.TieredMergePolicyProvider;
 import org.opensearch.index.cache.bitset.BitsetFilterCache;
+import org.opensearch.index.compositeindex.CompositeIndexConfig;
 import org.opensearch.index.engine.EngineConfig;
 import org.opensearch.index.fielddata.IndexFieldDataService;
 import org.opensearch.index.mapper.FieldMapper;
@@ -238,6 +239,13 @@ public final class IndexScopedSettings extends AbstractScopedSettings {
                 // Settings for concurrent segment search
                 IndexSettings.INDEX_CONCURRENT_SEGMENT_SEARCH_SETTING,
 
+                // Settings for composite index defaults
+                CompositeIndexConfig.STAR_TREE_DEFAULT_MAX_LEAF_DOCS,
+                CompositeIndexConfig.COMPOSITE_INDEX_MAX_DIMENSIONS_SETTING,
+                CompositeIndexConfig.COMPOSITE_INDEX_MAX_FIELDS_SETTING,
+                CompositeIndexConfig.DEFAULT_METRICS_LIST,
+                CompositeIndexConfig.DEFAULT_DATE_INTERVALS,
+
                 // validate that built-in similarities don't get redefined
                 Setting.groupSetting("index.similarity.", (s) -> {
                     Map<String, Settings> groups = s.getAsGroups();
@@ -250,7 +258,8 @@ public final class IndexScopedSettings extends AbstractScopedSettings {
                     }
                 }, Property.IndexScope), // this allows similarity settings to be passed
                 Setting.groupSetting("index.analysis.", Property.IndexScope), // this allows analysis settings to be passed
-                Setting.groupSetting("index.composite_index.", Property.IndexScope) // this allows composite index settings to be passed
+                Setting.groupSetting("index.composite_index.config.", Property.IndexScope) // this allows composite index settings to be
+                                                                                           // passed
             )
         )
     );

diff --git a/server/src/main/java/org/opensearch/index/IndexModule.java b/server/src/main/java/org/opensearch/index/IndexModule.java
@@ -66,7 +66,6 @@
 import org.opensearch.index.cache.query.DisabledQueryCache;
 import org.opensearch.index.cache.query.IndexQueryCache;
 import org.opensearch.index.cache.query.QueryCache;
-import org.opensearch.index.compositeindex.CompositeIndexSettings;
 import org.opensearch.index.engine.Engine;
 import org.opensearch.index.engine.EngineConfigFactory;
 import org.opensearch.index.engine.EngineFactory;
@@ -608,7 +607,7 @@ public IndexService newIndexService(
         Supplier<TimeValue> clusterDefaultRefreshIntervalSupplier,
         RecoverySettings recoverySettings,
         RemoteStoreSettings remoteStoreSettings,
-        CompositeIndexSettings compositeIndexSettings
+        BooleanSupplier isCompositeIndexCreationEnabled
     ) throws IOException {
         final IndexEventListener eventListener = freeze();
         Function<IndexService, CheckedFunction<DirectoryReader, DirectoryReader, IOException>> readerWrapperFactory = indexReaderWrapper
@@ -668,7 +667,7 @@ public IndexService newIndexService(
                 clusterDefaultRefreshIntervalSupplier,
                 recoverySettings,
                 remoteStoreSettings,
-                compositeIndexSettings
+                isCompositeIndexCreationEnabled
             );
             success = true;
             return indexService;

diff --git a/server/src/main/java/org/opensearch/index/IndexService.java b/server/src/main/java/org/opensearch/index/IndexService.java
@@ -73,7 +73,6 @@
 import org.opensearch.index.cache.bitset.BitsetFilterCache;
 import org.opensearch.index.cache.query.QueryCache;
 import org.opensearch.index.compositeindex.CompositeIndexConfig;
-import org.opensearch.index.compositeindex.CompositeIndexSettings;
 import org.opensearch.index.engine.Engine;
 import org.opensearch.index.engine.EngineConfigFactory;
 import org.opensearch.index.engine.EngineFactory;
@@ -227,7 +226,7 @@ public IndexService(
         Supplier<TimeValue> clusterDefaultRefreshIntervalSupplier,
         RecoverySettings recoverySettings,
         RemoteStoreSettings remoteStoreSettings,
-        CompositeIndexSettings compositeIndexSettings
+        BooleanSupplier isCompositeIndexCreationEnabled
     ) {
         super(indexSettings);
         this.allowExpensiveQueries = allowExpensiveQueries;
@@ -267,8 +266,9 @@ public IndexService(
             }
 
             if (indexSettings.getCompositeIndexConfig().hasCompositeFields()) {
+                // The validation is done right after the merge of the mapping later in the process ( similar to sort )
                 this.compositeIndexConfigSupplier = () -> indexSettings.getCompositeIndexConfig()
-                    .validateAndGetCompositeIndexConfig(mapperService::fieldType, compositeIndexSettings);
+                    .validateAndGetCompositeIndexConfig(mapperService::fieldType, isCompositeIndexCreationEnabled);
             } else {
                 this.compositeIndexConfigSupplier = () -> null;
             }

diff --git a/server/src/main/java/org/opensearch/index/compositeindex/CompositeFieldSpec.java b/server/src/main/java/org/opensearch/index/compositeindex/CompositeFieldSpec.java
@@ -17,6 +17,4 @@
  */
 
 @ExperimentalApi
-public interface CompositeFieldSpec {
-    void setDefaults(CompositeIndexSettings compositeIndexSettings);
-}
+public interface CompositeFieldSpec {}