Skip to content

[8.x] Backport 120040 + unmute tests #120061

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
elasticsearchmachine merged 2 commits into from
Jan 13, 2025
Merged

[8.x] Backport 120040 + unmute tests #120061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f360d2c
Clean up lingering tasks after DatafeedJobsIT. (#120040)
jan-elastic Jan 13, 2025
31d05d3
unmute tests
jan-elastic Jan 13, 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
18 changes: 0 additions & 18 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,12 +407,6 @@ tests:
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=synonyms/90_synonyms_reloading_for_synset/Reload analyzers for specific synonym set}
issue: https://github.com/elastic/elasticsearch/issues/116777
- class: org.elasticsearch.xpack.ml.integration.InferenceIngestInputConfigIT
method: testIngestWithInputFields
issue: https://github.com/elastic/elasticsearch/issues/118092
- class: org.elasticsearch.xpack.ml.integration.InferenceIngestInputConfigIT
method: testIngestWithMultipleInputFields
issue: https://github.com/elastic/elasticsearch/issues/118093
- class: org.elasticsearch.search.fieldcaps.FieldCapabilitiesIT
method: testRelocation
issue: https://github.com/elastic/elasticsearch/issues/119280
Expand All @@ -439,18 +433,6 @@ tests:
- class: org.elasticsearch.search.profile.dfs.DfsProfilerIT
method: testProfileDfs
issue: https://github.com/elastic/elasticsearch/issues/119711
- class: org.elasticsearch.xpack.ml.integration.MlJobIT
method: testCreateJobInCustomSharedIndexUpdatesMapping
issue: https://github.com/elastic/elasticsearch/issues/119660
- class: org.elasticsearch.xpack.ml.integration.MlJobIT
method: testUsage
issue: https://github.com/elastic/elasticsearch/issues/119659
- class: org.elasticsearch.xpack.ml.integration.MlJobIT
method: testOpenJob_GivenTimeout_Returns408
issue: https://github.com/elastic/elasticsearch/issues/119810
- class: org.elasticsearch.xpack.ml.integration.MlJobIT
method: testGetJob_GivenJobExists
issue: https://github.com/elastic/elasticsearch/issues/119811
- class: org.elasticsearch.xpack.security.authc.ldap.ADLdapUserSearchSessionFactoryTests
issue: https://github.com/elastic/elasticsearch/issues/119882
- class: org.elasticsearch.index.mapper.AbstractShapeGeometryFieldMapperTests
Expand Down
6 changes: 6 additions & 0 deletions ...de-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
import org.elasticsearch.action.admin.cluster.node.tasks.cancel.TransportCancelTasksAction;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.ReferenceDocs;
Expand Down Expand Up @@ -80,6 +82,10 @@ public class DatafeedJobsIT extends MlNativeAutodetectIntegTestCase {
public void cleanup() {
updateClusterSettings(Settings.builder().putNull("logger.org.elasticsearch.xpack.ml.datafeed"));
cleanUp();
// Race conditions between closing and killing tasks in these tests,
// sometimes result in lingering persistent tasks (such as "_close"),
// which cause subsequent tests to fail.
client().execute(TransportCancelTasksAction.TYPE, new CancelTasksRequest());
}

public void testLookbackOnly() throws Exception {
Expand Down
Loading