Skip to content

Commit 0219ac3

Browse files
Fix UnsignedLongTests test failure (#63056)
Test testSortDifferentFormatsShouldFail was occasionally failing for 2 reasons: 1) Documents on "idx2" were not available for search before a search request started 2) Running a test multiple times was causing occasional ResourceAlreadyExistsException for idx2, as idx2 was not deleted for a test. This patch makes the following fixes: 1) Sets up immediate refresh policy for docs in the index"idx2" 2) Creates an index idx2 only once per cluster Closes: #62997
1 parent c0cfe81 commit 0219ac3

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongTests.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
package org.elasticsearch.xpack.unsignedlong;
77

88
import org.elasticsearch.ElasticsearchException;
9+
import org.elasticsearch.action.bulk.BulkRequestBuilder;
10+
import org.elasticsearch.action.index.IndexRequest;
911
import org.elasticsearch.action.index.IndexRequestBuilder;
1012
import org.elasticsearch.action.search.SearchPhaseExecutionException;
1113
import org.elasticsearch.action.search.SearchRequestBuilder;
1214
import org.elasticsearch.action.search.SearchResponse;
15+
import org.elasticsearch.action.support.WriteRequest;
1316
import org.elasticsearch.common.settings.Settings;
1417
import org.elasticsearch.index.query.QueryBuilders;
1518
import org.elasticsearch.plugins.Plugin;
@@ -21,7 +24,6 @@
2124
import org.elasticsearch.search.sort.SortOrder;
2225
import org.elasticsearch.test.ESIntegTestCase;
2326

24-
import java.io.IOException;
2527
import java.math.BigInteger;
2628
import java.util.ArrayList;
2729
import java.util.Arrays;
@@ -67,6 +69,16 @@ public void setupSuiteScopeCluster() throws Exception {
6769
builders.add(client().prepareIndex("idx").setSource(jsonBuilder().startObject().field("ul_field", values[i]).endObject()));
6870
}
6971
indexRandom(true, builders);
72+
73+
prepareCreate("idx2").setMapping("ul_field", "type=long").setSettings(settings).get();
74+
BulkRequestBuilder bulkRequestBuilder = client().prepareBulk();
75+
bulkRequestBuilder.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
76+
for (int i = 0; i < 4; i++) {
77+
IndexRequest indexRequest = new IndexRequest("idx2").source("ul_field", values[i]);
78+
bulkRequestBuilder.add(indexRequest);
79+
}
80+
bulkRequestBuilder.get();
81+
7082
ensureSearchable();
7183
}
7284

@@ -267,16 +279,7 @@ public void testAggs() {
267279
}
268280
}
269281

270-
public void testSortDifferentFormatsShouldFail() throws IOException, InterruptedException {
271-
Settings.Builder settings = Settings.builder().put(indexSettings()).put("number_of_shards", 1);
272-
prepareCreate("idx2").setMapping("ul_field", "type=long").setSettings(settings).get();
273-
List<IndexRequestBuilder> builders = new ArrayList<>();
274-
for (int i = 0; i < 4; i++) {
275-
builders.add(client().prepareIndex("idx2").setSource(jsonBuilder().startObject().field("ul_field", values[i]).endObject()));
276-
}
277-
indexRandom(true, builders);
278-
ensureSearchable();
279-
282+
public void testSortDifferentFormatsShouldFail() {
280283
Exception exception = expectThrows(
281284
SearchPhaseExecutionException.class,
282285
() -> client().prepareSearch()

0 commit comments

Comments
 (0)