Skip to content

Commit b18ee7d

Browse files
jed326Jay Deng
authored and
Jay Deng
committed
Remove Concurrent Segment Search feature flags for feature launch
Signed-off-by: Jay Deng <jayd0104@gmail.com>
1 parent 0cd06fa commit b18ee7d

File tree

164 files changed

+110
-1088
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+110
-1088
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
135135
- Support index level allocation filtering for searchable snapshot index ([#11563](https://github.com/opensearch-project/OpenSearch/pull/11563))
136136
- Add `org.opensearch.rest.MethodHandlers` and `RestController#getAllHandlers` ([11876](https://github.com/opensearch-project/OpenSearch/pull/11876))
137137
- New DateTime format for RFC3339 compatible date fields ([#11465](https://github.com/opensearch-project/OpenSearch/pull/11465))
138+
- Remove concurrent segment search feature flag for GA launch ([#12074](https://github.com/opensearch-project/OpenSearch/pull/12074))
138139

139140
### Dependencies
140141
- Bumps jetty version to 9.4.52.v20230823 to fix GMS-2023-1857 ([#9822](https://github.com/opensearch-project/OpenSearch/pull/9822))

modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
import org.opensearch.action.search.SearchResponse;
3838
import org.opensearch.common.settings.Settings;
39-
import org.opensearch.common.util.FeatureFlags;
4039
import org.opensearch.index.query.Operator;
4140
import org.opensearch.plugins.Plugin;
4241
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
@@ -63,11 +62,6 @@ public static Collection<Object[]> parameters() {
6362
);
6463
}
6564

66-
@Override
67-
protected Settings featureFlagSettings() {
68-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
69-
}
70-
7165
@Override
7266
protected Collection<Class<? extends Plugin>> nodePlugins() {
7367
return Arrays.asList(CommonAnalysisModulePlugin.class);

modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java

-6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
import org.opensearch.action.search.SearchResponse;
3838
import org.opensearch.common.settings.Settings;
39-
import org.opensearch.common.util.FeatureFlags;
4039
import org.opensearch.common.xcontent.XContentFactory;
4140
import org.opensearch.core.xcontent.XContentBuilder;
4241
import org.opensearch.index.IndexSettings;
@@ -82,11 +81,6 @@ public static Collection<Object[]> parameters() {
8281
);
8382
}
8483

85-
@Override
86-
protected Settings featureFlagSettings() {
87-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
88-
}
89-
9084
@Override
9185
protected Collection<Class<? extends Plugin>> nodePlugins() {
9286
return Arrays.asList(CommonAnalysisModulePlugin.class);

modules/geo/src/internalClusterTest/java/org/opensearch/geo/GeoModulePluginIntegTestCase.java

-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
1212

1313
import org.opensearch.common.settings.Settings;
14-
import org.opensearch.common.util.FeatureFlags;
1514
import org.opensearch.geometry.utils.StandardValidator;
1615
import org.opensearch.geometry.utils.WellKnownText;
1716
import org.opensearch.index.mapper.GeoShapeFieldMapper;
@@ -47,11 +46,6 @@ public static Collection<Object[]> parameters() {
4746
);
4847
}
4948

50-
@Override
51-
protected Settings featureFlagSettings() {
52-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
53-
}
54-
5549
/**
5650
* Returns a collection of plugins that should be loaded on each node for doing the integration tests. As this
5751
* geo plugin is not getting packaged in a zip, we need to load it before the tests run.

modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.opensearch.action.update.UpdateRequestBuilder;
4242
import org.opensearch.common.lucene.search.function.CombineFunction;
4343
import org.opensearch.common.settings.Settings;
44-
import org.opensearch.common.util.FeatureFlags;
4544
import org.opensearch.common.xcontent.XContentFactory;
4645
import org.opensearch.core.xcontent.XContentBuilder;
4746
import org.opensearch.index.query.QueryBuilders;
@@ -94,11 +93,6 @@ public static Collection<Object[]> parameters() {
9493
);
9594
}
9695

97-
@Override
98-
protected Settings featureFlagSettings() {
99-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
100-
}
101-
10296
@Override
10397
protected Collection<Class<? extends Plugin>> nodePlugins() {
10498
return Collections.singleton(ExpressionModulePlugin.class);

modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
3636

3737
import org.opensearch.common.settings.Settings;
38-
import org.opensearch.common.util.FeatureFlags;
3938
import org.opensearch.core.common.bytes.BytesArray;
4039
import org.opensearch.core.xcontent.MediaTypeRegistry;
4140
import org.opensearch.plugins.Plugin;
@@ -68,11 +67,6 @@ public static Collection<Object[]> parameters() {
6867
);
6968
}
7069

71-
@Override
72-
protected Settings featureFlagSettings() {
73-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
74-
}
75-
7670
@Override
7771
protected Settings nodeSettings(int nodeOrdinal) {
7872
Settings.Builder builder = Settings.builder().put(super.nodeSettings(nodeOrdinal));

modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.opensearch.action.index.IndexRequestBuilder;
3838
import org.opensearch.action.search.SearchRequest;
3939
import org.opensearch.common.settings.Settings;
40-
import org.opensearch.common.util.FeatureFlags;
4140
import org.opensearch.index.IndexNotFoundException;
4241
import org.opensearch.plugins.Plugin;
4342
import org.opensearch.script.ScriptType;
@@ -72,11 +71,6 @@ public static Collection<Object[]> parameters() {
7271
);
7372
}
7473

75-
@Override
76-
protected Settings featureFlagSettings() {
77-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
78-
}
79-
8074
@Override
8175
protected Collection<Class<? extends Plugin>> nodePlugins() {
8276
return Collections.singleton(MustacheModulePlugin.class);

modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.opensearch.client.Requests;
4242
import org.opensearch.cluster.metadata.IndexMetadata;
4343
import org.opensearch.common.settings.Settings;
44-
import org.opensearch.common.util.FeatureFlags;
4544
import org.opensearch.search.SearchHit;
4645
import org.opensearch.search.aggregations.AggregationBuilders;
4746
import org.opensearch.search.aggregations.InternalAggregation;
@@ -89,11 +88,6 @@ public static Collection<Object[]> parameters() {
8988
);
9089
}
9190

92-
@Override
93-
protected Settings featureFlagSettings() {
94-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
95-
}
96-
9791
public void testChildrenAggs() throws Exception {
9892
SearchResponse searchResponse = client().prepareSearch("test")
9993
.setQuery(matchQuery("randomized", true))

modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ParentIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.opensearch.action.search.SearchRequestBuilder;
3838
import org.opensearch.action.search.SearchResponse;
3939
import org.opensearch.common.settings.Settings;
40-
import org.opensearch.common.util.FeatureFlags;
4140
import org.opensearch.search.aggregations.Aggregation;
4241
import org.opensearch.search.aggregations.bucket.MultiBucketsAggregation;
4342
import org.opensearch.search.aggregations.bucket.terms.Terms;
@@ -76,11 +75,6 @@ public static Collection<Object[]> parameters() {
7675
);
7776
}
7877

79-
@Override
80-
protected Settings featureFlagSettings() {
81-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
82-
}
83-
8478
public void testSimpleParentAgg() throws Exception {
8579
final SearchRequestBuilder searchRequest = client().prepareSearch("test")
8680
.setSize(10000)

modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.opensearch.common.lucene.search.function.FunctionScoreQuery;
4545
import org.opensearch.common.settings.Settings;
4646
import org.opensearch.common.unit.TimeValue;
47-
import org.opensearch.common.util.FeatureFlags;
4847
import org.opensearch.core.rest.RestStatus;
4948
import org.opensearch.index.query.BoolQueryBuilder;
5049
import org.opensearch.index.query.IdsQueryBuilder;
@@ -118,11 +117,6 @@ public static Collection<Object[]> parameters() {
118117
);
119118
}
120119

121-
@Override
122-
protected Settings featureFlagSettings() {
123-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
124-
}
125-
126120
public void testMultiLevelChild() throws Exception {
127121
assertAcked(
128122
prepareCreate("test").setMapping(

modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import org.opensearch.action.search.SearchPhaseExecutionException;
4141
import org.opensearch.action.search.SearchResponse;
4242
import org.opensearch.common.settings.Settings;
43-
import org.opensearch.common.util.FeatureFlags;
4443
import org.opensearch.index.IndexSettings;
4544
import org.opensearch.index.query.BoolQueryBuilder;
4645
import org.opensearch.index.query.InnerHitBuilder;
@@ -105,11 +104,6 @@ public static Collection<Object[]> parameters() {
105104
);
106105
}
107106

108-
@Override
109-
protected Settings featureFlagSettings() {
110-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
111-
}
112-
113107
@Override
114108
protected Collection<Class<? extends Plugin>> nodePlugins() {
115109
ArrayList<Class<? extends Plugin>> plugins = new ArrayList<>(super.nodePlugins());

modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.opensearch.common.geo.GeoPoint;
4242
import org.opensearch.common.settings.Settings;
4343
import org.opensearch.common.unit.DistanceUnit;
44-
import org.opensearch.common.util.FeatureFlags;
4544
import org.opensearch.common.xcontent.XContentFactory;
4645
import org.opensearch.common.xcontent.XContentType;
4746
import org.opensearch.core.common.bytes.BytesArray;
@@ -104,11 +103,6 @@ public static Collection<Object[]> parameters() {
104103
);
105104
}
106105

107-
@Override
108-
protected Settings featureFlagSettings() {
109-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
110-
}
111-
112106
@Override
113107
protected boolean addMockGeoShapeFieldMapper() {
114108
return false;

modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.opensearch.action.search.SearchRequest;
4040
import org.opensearch.action.support.IndicesOptions;
4141
import org.opensearch.common.settings.Settings;
42-
import org.opensearch.common.util.FeatureFlags;
4342
import org.opensearch.index.IndexNotFoundException;
4443
import org.opensearch.index.query.MatchAllQueryBuilder;
4544
import org.opensearch.index.query.QueryBuilders;
@@ -80,11 +79,6 @@ public static Collection<Object[]> parameters() {
8079
);
8180
}
8281

83-
@Override
84-
protected Settings featureFlagSettings() {
85-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
86-
}
87-
8882
@Override
8983
protected Collection<Class<? extends Plugin>> nodePlugins() {
9084
return Arrays.asList(RankEvalModulePlugin.class);

server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/node/tasks/CancellableTasksIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import org.opensearch.common.action.ActionFuture;
5353
import org.opensearch.common.inject.Inject;
5454
import org.opensearch.common.settings.Settings;
55-
import org.opensearch.common.util.FeatureFlags;
5655
import org.opensearch.common.util.concurrent.AbstractRunnable;
5756
import org.opensearch.common.util.concurrent.ConcurrentCollections;
5857
import org.opensearch.common.util.set.Sets;
@@ -119,11 +118,6 @@ public static Collection<Object[]> parameters() {
119118
);
120119
}
121120

122-
@Override
123-
protected Settings featureFlagSettings() {
124-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
125-
}
126-
127121
@Before
128122
public void resetTestStates() {
129123
idGenerator = 0;

server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/node/tasks/ConcurrentSearchTasksIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
import org.opensearch.common.settings.FeatureFlagSettings;
1616
import org.opensearch.common.settings.Setting;
1717
import org.opensearch.common.settings.Settings;
18-
import org.opensearch.common.util.FeatureFlags;
1918
import org.opensearch.core.tasks.resourcetracker.ThreadResourceInfo;
2019
import org.opensearch.index.query.QueryBuilders;
20+
import org.opensearch.search.SearchService;
2121
import org.opensearch.tasks.TaskInfo;
2222
import org.hamcrest.MatcherAssert;
2323

@@ -44,6 +44,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
4444
.put(super.nodeSettings(nodeOrdinal))
4545
.put("thread_pool.index_searcher.size", INDEX_SEARCHER_THREADS)
4646
.put("thread_pool.index_searcher.queue_size", INDEX_SEARCHER_THREADS)
47+
.put(SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true)
4748
.build();
4849
}
4950

@@ -66,7 +67,6 @@ protected Settings featureFlagSettings() {
6667
for (Setting builtInFlag : FeatureFlagSettings.BUILT_IN_FEATURE_FLAGS) {
6768
featureSettings.put(builtInFlag.getKey(), builtInFlag.getDefaultRaw(Settings.EMPTY));
6869
}
69-
featureSettings.put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, true);
7070
return featureSettings.build();
7171
}
7272

server/src/internalClusterTest/java/org/opensearch/index/IndexSortIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.apache.lucene.search.SortedNumericSortField;
4040
import org.apache.lucene.search.SortedSetSortField;
4141
import org.opensearch.common.settings.Settings;
42-
import org.opensearch.common.util.FeatureFlags;
4342
import org.opensearch.core.xcontent.XContentBuilder;
4443
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
4544

@@ -66,11 +65,6 @@ public static Collection<Object[]> parameters() {
6665
);
6766
}
6867

69-
@Override
70-
protected Settings featureFlagSettings() {
71-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
72-
}
73-
7468
private static XContentBuilder createTestMapping() {
7569
try {
7670
return jsonBuilder().startObject()

server/src/internalClusterTest/java/org/opensearch/index/search/MatchPhraseQueryIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.opensearch.action.index.IndexRequestBuilder;
3939
import org.opensearch.action.search.SearchResponse;
4040
import org.opensearch.common.settings.Settings;
41-
import org.opensearch.common.util.FeatureFlags;
4241
import org.opensearch.index.query.MatchPhraseQueryBuilder;
4342
import org.opensearch.index.search.MatchQuery.ZeroTermsQuery;
4443
import org.opensearch.test.ParameterizedStaticSettingsOpenSearchIntegTestCase;
@@ -71,11 +70,6 @@ public static Collection<Object[]> parameters() {
7170
);
7271
}
7372

74-
@Override
75-
protected Settings featureFlagSettings() {
76-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
77-
}
78-
7973
@Before
8074
public void setUp() throws Exception {
8175
super.setUp();

server/src/internalClusterTest/java/org/opensearch/index/suggest/stats/SuggestStatsIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.opensearch.cluster.routing.ShardIterator;
4545
import org.opensearch.cluster.routing.ShardRouting;
4646
import org.opensearch.common.settings.Settings;
47-
import org.opensearch.common.util.FeatureFlags;
4847
import org.opensearch.index.search.stats.SearchStats;
4948
import org.opensearch.search.suggest.SuggestBuilder;
5049
import org.opensearch.search.suggest.phrase.PhraseSuggestionBuilder;
@@ -82,11 +81,6 @@ public static Collection<Object[]> parameters() {
8281
);
8382
}
8483

85-
@Override
86-
protected Settings featureFlagSettings() {
87-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
88-
}
89-
9084
@Override
9185
protected int numberOfReplicas() {
9286
return 0;

server/src/internalClusterTest/java/org/opensearch/indices/IndicesRequestCacheIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.opensearch.cluster.metadata.IndexMetadata;
4343
import org.opensearch.common.settings.Settings;
4444
import org.opensearch.common.time.DateFormatter;
45-
import org.opensearch.common.util.FeatureFlags;
4645
import org.opensearch.index.cache.request.RequestCacheStats;
4746
import org.opensearch.index.query.QueryBuilders;
4847
import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
@@ -82,11 +81,6 @@ public static Collection<Object[]> parameters() {
8281
);
8382
}
8483

85-
@Override
86-
protected Settings featureFlagSettings() {
87-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
88-
}
89-
9084
// One of the primary purposes of the query cache is to cache aggs results
9185
public void testCacheAggs() throws Exception {
9286
Client client = client();

server/src/internalClusterTest/java/org/opensearch/indices/memory/breaker/CircuitBreakerServiceIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider;
5151
import org.opensearch.common.settings.Settings;
5252
import org.opensearch.common.unit.TimeValue;
53-
import org.opensearch.common.util.FeatureFlags;
5453
import org.opensearch.core.common.breaker.CircuitBreaker;
5554
import org.opensearch.core.common.breaker.CircuitBreakingException;
5655
import org.opensearch.core.common.breaker.NoopCircuitBreaker;
@@ -107,11 +106,6 @@ public static Collection<Object[]> parameters() {
107106
);
108107
}
109108

110-
@Override
111-
protected Settings featureFlagSettings() {
112-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
113-
}
114-
115109
@Override
116110
protected Settings nodeSettings(int nodeOrdinal) {
117111
return Settings.builder()

0 commit comments

Comments
 (0)