Skip to content

Commit 89ba03e

Browse files
Remove call to super.cleanupCluster in cleanup methods which does not override parent method (#122209)
ReindexDataStreamIndexAction.cleanupCluster called EsIntegTestCase.cleanupCluster, but did not override it. This caused EsIntegTestCase.cleanupCluster to be called twice, once in ReindexDataStreamIndexAction.cleanupCluster and once when the After annotation is called on EsIntegTestCase.
1 parent 7c614fd commit 89ba03e

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

muted-tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,6 @@ tests:
371371
issue: https://github.com/elastic/elasticsearch/issues/121503
372372
- class: org.elasticsearch.xpack.application.CohereServiceUpgradeIT
373373
issue: https://github.com/elastic/elasticsearch/issues/121537
374-
- class: org.elasticsearch.xpack.migrate.action.ReindexDatastreamIndexTransportActionIT
375-
issue: https://github.com/elastic/elasticsearch/issues/121737
376374
- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
377375
method: testWatcherWithApiKey {cluster=UPGRADED}
378376
issue: https://github.com/elastic/elasticsearch/issues/122061

x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import org.elasticsearch.action.bulk.BulkRequest;
2525
import org.elasticsearch.action.bulk.BulkResponse;
2626
import org.elasticsearch.action.index.IndexRequest;
27-
import org.elasticsearch.action.ingest.DeletePipelineRequest;
28-
import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
2927
import org.elasticsearch.action.ingest.PutPipelineRequest;
3028
import org.elasticsearch.action.ingest.PutPipelineTransportAction;
3129
import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -70,18 +68,8 @@
7068

7169
public class ReindexDatastreamIndexTransportActionIT extends ESIntegTestCase {
7270
@After
73-
private void cleanupCluster() throws Exception {
74-
safeGet(
75-
clusterAdmin().execute(
76-
DeletePipelineTransportAction.TYPE,
77-
new DeletePipelineRequest(
78-
TEST_REQUEST_TIMEOUT,
79-
TEST_REQUEST_TIMEOUT,
80-
MigrateTemplateRegistry.REINDEX_DATA_STREAM_PIPELINE_NAME
81-
)
82-
)
83-
);
84-
super.cleanUpCluster();
71+
private void cleanup() {
72+
deletePipeline(MigrateTemplateRegistry.REINDEX_DATA_STREAM_PIPELINE_NAME);
8573
}
8674

8775
private static final String MAPPING = """

0 commit comments

Comments
 (0)