Skip to content

Remove call to super.cleanupCluster in cleanup methods which does not override parent method #122209

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 2 commits into from
Feb 10, 2025
Merged

Remove call to super.cleanupCluster in cleanup methods which does not override parent method #122209

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
6a1acc7
Do not call clusterCleanup in cleanup
parkertimmins Feb 10, 2025
48fef1c
[CI] Auto commit changes from spotless
Feb 10, 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
2 changes: 0 additions & 2 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,6 @@ tests:
issue: https://github.com/elastic/elasticsearch/issues/121503
- class: org.elasticsearch.xpack.application.CohereServiceUpgradeIT
issue: https://github.com/elastic/elasticsearch/issues/121537
- class: org.elasticsearch.xpack.migrate.action.ReindexDatastreamIndexTransportActionIT
issue: https://github.com/elastic/elasticsearch/issues/121737
- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
method: testWatcherWithApiKey {cluster=UPGRADED}
issue: https://github.com/elastic/elasticsearch/issues/122061
Expand Down
16 changes: 2 additions & 14 deletions .../java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.bulk.BulkResponse;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.ingest.DeletePipelineRequest;
import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
import org.elasticsearch.action.ingest.PutPipelineRequest;
import org.elasticsearch.action.ingest.PutPipelineTransportAction;
import org.elasticsearch.cluster.block.ClusterBlockException;
Expand Down Expand Up @@ -70,18 +68,8 @@

public class ReindexDatastreamIndexTransportActionIT extends ESIntegTestCase {
@After
private void cleanupCluster() throws Exception {
safeGet(
clusterAdmin().execute(
DeletePipelineTransportAction.TYPE,
new DeletePipelineRequest(
TEST_REQUEST_TIMEOUT,
TEST_REQUEST_TIMEOUT,
MigrateTemplateRegistry.REINDEX_DATA_STREAM_PIPELINE_NAME
)
)
);
super.cleanUpCluster();
private void cleanup() {
deletePipeline(MigrateTemplateRegistry.REINDEX_DATA_STREAM_PIPELINE_NAME);
}

private static final String MAPPING = """
Expand Down