Skip to content

Commit 3c250e8

Browse files
Remove call to super.cleanupCluster in cleanup methods which does not override parent method (#122209) (#122260)
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. (cherry picked from commit 89ba03e) # Conflicts: # muted-tests.yml
1 parent 1782b57 commit 3c250e8

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

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)