Skip to content

Commit 1e7397b

Browse files
e-emotorayshrey
e-emoto
authored and
rayshrey
committed
Fixed test cases for concurrent search (opensearch-project#11119)
Fixed test cases Updated fix for TransportTwoNodesSearchIT test cases Updated test cases and muted flaky tests Move indexRandomForConcurrentSearch call into prepareData Remove changes from TransportTwoNodesSearchIT.java until future fix Signed-off-by: Ethan Emoto <eemoto@amazon.com>
1 parent 1d26f39 commit 1e7397b

File tree

8 files changed

+27
-1
lines changed

8 files changed

+27
-1
lines changed

‎server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/DerivativeIT.java

+1
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,7 @@ public void testAvgMovavgDerivNPE() throws Exception {
693693
}
694694

695695
refresh();
696+
indexRandomForConcurrentSearch("movavg_npe");
696697

697698
SearchResponse response = client().prepareSearch("movavg_npe")
698699
.addAggregation(

‎server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/MovAvgIT.java

+1
Original file line numberDiff line numberDiff line change
@@ -1320,6 +1320,7 @@ public void testPredictWithNonEmptyBuckets() throws Exception {
13201320
.setSource(jsonBuilder().startObject().field(INTERVAL_FIELD, i).field(VALUE_FIELD2, 10).endObject())
13211321
);
13221322
}
1323+
indexRandomForConcurrentSearch("predict_non_empty");
13231324

13241325
bulkBuilder.get();
13251326
ensureSearchable();

‎server/src/internalClusterTest/java/org/opensearch/search/basic/SearchRedStateIndexIT.java

+1
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ private void buildRedIndex(int numShards) throws Exception {
153153
client().prepareIndex("test").setId("" + i).setSource("field1", "value1").get();
154154
}
155155
refresh();
156+
indexRandomForConcurrentSearch("test");
156157

157158
internalCluster().stopRandomDataNode();
158159

‎server/src/internalClusterTest/java/org/opensearch/search/basic/SearchWhileCreatingIndexIT.java

+1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ private void searchWhileCreatingIndex(boolean createIndex, int numberOfReplicas)
106106
}
107107
client().prepareIndex("test").setId(id).setSource("field", "test").get();
108108
RefreshResponse refreshResponse = client().admin().indices().prepareRefresh("test").get();
109+
indexRandomForConcurrentSearch("test");
109110
// at least one shard should be successful when refreshing
110111
assertThat(refreshResponse.getSuccessfulShards(), greaterThanOrEqualTo(1));
111112

‎server/src/internalClusterTest/java/org/opensearch/search/fetch/FetchSubPhasePluginIT.java

+5
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
100100

101101
@SuppressWarnings("unchecked")
102102
public void testPlugin() throws Exception {
103+
assumeFalse(
104+
"Concurrent search case muted pending fix: https://github.com/opensearch-project/OpenSearch/issues/11112",
105+
internalCluster().clusterService().getClusterSettings().get(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING)
106+
);
103107
client().admin()
104108
.indices()
105109
.prepareCreate("test")
@@ -119,6 +123,7 @@ public void testPlugin() throws Exception {
119123
.actionGet();
120124

121125
client().admin().indices().prepareRefresh().get();
126+
indexRandomForConcurrentSearch("test");
122127

123128
SearchResponse response = client().prepareSearch()
124129
.setSource(new SearchSourceBuilder().ext(Collections.singletonList(new TermVectorsFetchBuilder("test"))))

‎server/src/internalClusterTest/java/org/opensearch/search/functionscore/RandomScoreFunctionIT.java

+3
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ public void testScoreAccessWithinScript() throws Exception {
207207
.get();
208208
}
209209
refresh();
210+
indexRandomForConcurrentSearch("test");
210211

211212
Map<String, Object> params = new HashMap<>();
212213
params.put("factor", randomIntBetween(2, 4));
@@ -368,6 +369,7 @@ public void testScoreRange() throws Exception {
368369
}
369370
flush();
370371
refresh();
372+
indexRandomForConcurrentSearch("test");
371373
int iters = scaledRandomIntBetween(10, 20);
372374
for (int i = 0; i < iters; ++i) {
373375
SearchResponse searchResponse = client().prepareSearch()
@@ -390,6 +392,7 @@ public void testSeeds() throws Exception {
390392
index("test", "type", "" + i, jsonBuilder().startObject().endObject());
391393
}
392394
flushAndRefresh();
395+
indexRandomForConcurrentSearch("test");
393396

394397
assertNoFailures(
395398
client().prepareSearch()

‎server/src/internalClusterTest/java/org/opensearch/search/geo/GeoFilterIT.java

+2
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ public void testShapeRelations() throws Exception {
266266

267267
client().prepareIndex("shapes").setId("1").setSource(data, MediaTypeRegistry.JSON).get();
268268
client().admin().indices().prepareRefresh().get();
269+
indexRandomForConcurrentSearch("shapes");
269270

270271
// Point in polygon
271272
SearchResponse result = client().prepareSearch()
@@ -427,6 +428,7 @@ public void testBulk() throws Exception {
427428

428429
client().admin().indices().prepareCreate("countries").setSettings(settings).setMapping(xContentBuilder).get();
429430
BulkResponse bulk = client().prepareBulk().add(bulkAction, 0, bulkAction.length, null, xContentBuilder.contentType()).get();
431+
indexRandomForConcurrentSearch("countries");
430432

431433
for (BulkItemResponse item : bulk.getItems()) {
432434
assertFalse("unable to index data", item.isFailed());

‎server/src/internalClusterTest/java/org/opensearch/search/morelikethis/MoreLikeThisIT.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ public void testSimpleMoreLikeThis() throws Exception {
125125
client().index(indexRequest("test").id("2").source(jsonBuilder().startObject().field("text", "lucene release").endObject()))
126126
.actionGet();
127127
client().admin().indices().refresh(refreshRequest()).actionGet();
128+
indexRandomForConcurrentSearch("test");
128129

129130
logger.info("Running moreLikeThis");
130131
SearchResponse response = client().prepareSearch()
@@ -155,6 +156,7 @@ public void testSimpleMoreLikeThisWithTypes() throws Exception {
155156
client().index(indexRequest("test").id("2").source(jsonBuilder().startObject().field("text", "lucene release").endObject()))
156157
.actionGet();
157158
client().admin().indices().refresh(refreshRequest()).actionGet();
159+
indexRandomForConcurrentSearch("test");
158160

159161
logger.info("Running moreLikeThis");
160162
SearchResponse response = client().prepareSearch()
@@ -190,6 +192,7 @@ public void testMoreLikeThisForZeroTokensInOneOfTheAnalyzedFields() throws Excep
190192
).actionGet();
191193

192194
client().admin().indices().refresh(refreshRequest()).actionGet();
195+
indexRandomForConcurrentSearch("test");
193196

194197
SearchResponse searchResponse = client().prepareSearch()
195198
.setQuery(
@@ -256,6 +259,7 @@ public void testMoreLikeThisWithAliases() throws Exception {
256259
client().index(indexRequest("test").id("4").source(jsonBuilder().startObject().field("text", "opensearch release").endObject()))
257260
.actionGet();
258261
client().admin().indices().refresh(refreshRequest()).actionGet();
262+
indexRandomForConcurrentSearch("test");
259263

260264
logger.info("Running moreLikeThis on index");
261265
SearchResponse response = client().prepareSearch()
@@ -304,6 +308,7 @@ public void testMoreLikeThisWithAliasesInLikeDocuments() throws Exception {
304308
client().index(indexRequest(indexName).id("3").source(jsonBuilder().startObject().field("text", "opensearch index").endObject()))
305309
.actionGet();
306310
refresh(indexName);
311+
indexRandomForConcurrentSearch(indexName);
307312

308313
SearchResponse response = client().prepareSearch()
309314
.setQuery(new MoreLikeThisQueryBuilder(null, new Item[] { new Item(aliasName, "1") }).minTermFreq(1).minDocFreq(1))
@@ -321,6 +326,7 @@ public void testMoreLikeThisIssue2197() throws Exception {
321326
.get();
322327
client().admin().indices().prepareRefresh("foo").get();
323328
assertThat(ensureGreen(), equalTo(ClusterHealthStatus.GREEN));
329+
indexRandomForConcurrentSearch("foo");
324330

325331
SearchResponse response = client().prepareSearch()
326332
.setQuery(new MoreLikeThisQueryBuilder(null, new Item[] { new Item("foo", "1") }))
@@ -344,6 +350,7 @@ public void testMoreLikeWithCustomRouting() throws Exception {
344350
.setRouting("2")
345351
.get();
346352
client().admin().indices().prepareRefresh("foo").get();
353+
indexRandomForConcurrentSearch("foo");
347354

348355
SearchResponse response = client().prepareSearch()
349356
.setQuery(new MoreLikeThisQueryBuilder(null, new Item[] { new Item("foo", "1").routing("2") }))
@@ -368,6 +375,7 @@ public void testMoreLikeThisIssueRoutingNotSerialized() throws Exception {
368375
.setRouting("4000")
369376
.get();
370377
client().admin().indices().prepareRefresh("foo").get();
378+
indexRandomForConcurrentSearch("foo");
371379
SearchResponse response = client().prepareSearch()
372380
.setQuery(new MoreLikeThisQueryBuilder(null, new Item[] { new Item("foo", "1").routing("4000") }))
373381
.get();
@@ -401,6 +409,7 @@ public void testNumericField() throws Exception {
401409
.get();
402410

403411
refresh();
412+
indexRandomForConcurrentSearch("test");
404413

405414
// Implicit list of fields -> ignore numeric fields
406415
SearchResponse searchResponse = client().prepareSearch()
@@ -508,6 +517,7 @@ public void testMoreLikeThisWithFieldAlias() throws Exception {
508517
index("test", "_doc", "1", "text", "lucene");
509518
index("test", "_doc", "2", "text", "lucene release");
510519
refresh();
520+
indexRandomForConcurrentSearch("test");
511521

512522
Item item = new Item("test", "1");
513523
QueryBuilder query = QueryBuilders.moreLikeThisQuery(new String[] { "alias" }, null, new Item[] { item })
@@ -548,6 +558,7 @@ public void testSimpleMoreLikeInclude() throws Exception {
548558
.source(jsonBuilder().startObject().field("text", "Lucene has been ported to other programming languages").endObject())
549559
).actionGet();
550560
client().admin().indices().refresh(refreshRequest()).actionGet();
561+
indexRandomForConcurrentSearch("test");
551562

552563
logger.info("Running More Like This with include true");
553564
SearchResponse response = client().prepareSearch()
@@ -832,11 +843,12 @@ public void testSelectFields() throws IOException, ExecutionException, Interrupt
832843
assertHitCount(response, 1);
833844
}
834845

835-
public void testWithRouting() throws IOException {
846+
public void testWithRouting() throws IOException, InterruptedException {
836847
client().prepareIndex("index").setId("1").setRouting("3").setSource("text", "this is a document").get();
837848
client().prepareIndex("index").setId("2").setRouting("1").setSource("text", "this is another document").get();
838849
client().prepareIndex("index").setId("3").setRouting("4").setSource("text", "this is yet another document").get();
839850
refresh("index");
851+
indexRandomForConcurrentSearch("index");
840852

841853
Item item = new Item("index", "2").routing("1");
842854
MoreLikeThisQueryBuilder moreLikeThisQueryBuilder = new MoreLikeThisQueryBuilder(

0 commit comments

Comments
 (0)