Skip to content

Fix ShardBulkInferenceActionFilterIT#testRestart #127671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 6, 2025
Merged

Fix ShardBulkInferenceActionFilterIT#testRestart #127671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72ccd71
Fix ShardBulkInferenceActionFilterIT#testRestart
jimczi May 3, 2025
ecd6243
[CI] Auto commit changes from spotless
elasticsearchmachine May 3, 2025
0fd9565
Merge remote-tracking branch 'upstream/main' into fix_test_restart
jimczi May 5, 2025
f95891f
address review comment
jimczi May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,18 +417,6 @@ tests:
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
method: test
issue: https://github.com/elastic/elasticsearch/issues/127536
- class: org.elasticsearch.xpack.inference.action.filter.ShardBulkInferenceActionFilterIT
method: testRestart {p0=false p1=false}
issue: https://github.com/elastic/elasticsearch/issues/127592
- class: org.elasticsearch.xpack.inference.action.filter.ShardBulkInferenceActionFilterIT
method: testRestart {p0=true p1=false}
issue: https://github.com/elastic/elasticsearch/issues/127593
- class: org.elasticsearch.xpack.inference.action.filter.ShardBulkInferenceActionFilterIT
method: testRestart {p0=false p1=true}
issue: https://github.com/elastic/elasticsearch/issues/127594
- class: org.elasticsearch.xpack.inference.action.filter.ShardBulkInferenceActionFilterIT
method: testRestart {p0=true p1=true}
issue: https://github.com/elastic/elasticsearch/issues/127595
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=ml/data_frame_analytics_cat_apis/Test cat data frame analytics all jobs with header}
issue: https://github.com/elastic/elasticsearch/issues/127625
Expand Down
30 changes: 9 additions & 21 deletions ...ava/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilterIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;

import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
import org.elasticsearch.action.bulk.BulkItemResponse;
import org.elasticsearch.action.bulk.BulkRequestBuilder;
import org.elasticsearch.action.bulk.BulkResponse;
import org.elasticsearch.action.delete.DeleteRequestBuilder;
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.support.WriteRequest;
import org.elasticsearch.action.update.UpdateRequestBuilder;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings;
Expand Down Expand Up @@ -242,12 +242,10 @@ public void testRestart() throws Exception {

private void assertRandomBulkOperations(String indexName, Function<Boolean, Map<String, Object>> sourceSupplier) throws Exception {
int numHits = numHits(indexName);
int totalBulkReqs = randomIntBetween(2, 100);
long totalDocs = numHits;
int totalBulkReqs = randomIntBetween(2, 10);
Set<String> ids = new HashSet<>();

for (int bulkReqs = numHits; bulkReqs < totalBulkReqs; bulkReqs++) {
BulkRequestBuilder bulkReqBuilder = client().prepareBulk();
for (int bulkReqs = 0; bulkReqs < totalBulkReqs; bulkReqs++) {
BulkRequestBuilder bulkReqBuilder = client().prepareBulk().setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
int totalBulkSize = randomIntBetween(1, 100);
for (int bulkSize = 0; bulkSize < totalBulkSize; bulkSize++) {
if (ids.size() > 0 && rarely(random())) {
Expand All @@ -257,24 +255,15 @@ private void assertRandomBulkOperations(String indexName, Function<Boolean, Map<
bulkReqBuilder.add(request);
continue;
}
String id = Long.toString(totalDocs++);
boolean isIndexRequest = randomBoolean();
boolean isIndexRequest = ids.size() == 0 || randomBoolean();
Map<String, Object> source = sourceSupplier.apply(isIndexRequest);
if (isIndexRequest) {
String id = randomAlphaOfLength(20);
bulkReqBuilder.add(new IndexRequestBuilder(client()).setIndex(indexName).setId(id).setSource(source));
ids.add(id);
} else {
boolean isUpsert = randomBoolean();
UpdateRequestBuilder request = new UpdateRequestBuilder(client()).setIndex(indexName).setDoc(source);
if (isUpsert || ids.size() == 0) {
request.setDocAsUpsert(true);
} else {
// Update already existing document
id = randomFrom(ids);
}
request.setId(id);
bulkReqBuilder.add(request);
ids.add(id);
String id = randomFrom(ids);
bulkReqBuilder.add(new UpdateRequestBuilder(client()).setIndex(indexName).setId(id).setDoc(source));
}
}
BulkResponse bulkResponse = bulkReqBuilder.get();
Expand All @@ -293,8 +282,7 @@ private void assertRandomBulkOperations(String indexName, Function<Boolean, Map<
}
assertFalse(bulkResponse.hasFailures());
}
client().admin().indices().refresh(new RefreshRequest(indexName)).get();
assertThat(numHits(indexName), equalTo(ids.size() + numHits));
assertThat(numHits(indexName), equalTo(numHits + ids.size()));
}

private int numHits(String indexName) throws Exception {
Expand Down