Skip to content

Conversation

parkertimmins
Copy link
Contributor

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.

@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-data-management (Team:Data Management)

Copy link
Member

@masseyke masseyke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if this will actually fix the test, but it definitely removes a call to super.cleanupCluster that is not supposed to be there.

@parkertimmins parkertimmins merged commit 89ba03e into elastic:main Feb 10, 2025
17 checks passed
@parkertimmins parkertimmins deleted the reindex-data-stream-fix-cleanup-bug branch February 10, 2025 20:49
parkertimmins added a commit to parkertimmins/elasticsearch that referenced this pull request Feb 11, 2025
… override parent method (elastic#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.

(cherry picked from commit 89ba03e)

# Conflicts:
#	muted-tests.yml
#	x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java
@parkertimmins
Copy link
Contributor Author

💔 Some backports could not be created

Status Branch Result
8.x
9.0 Conflict resolution was aborted by the user
8.18

Manual backport

To create the backport manually run:

backport --pr 122209

Questions ?

Please refer to the Backport tool documentation

parkertimmins added a commit to parkertimmins/elasticsearch that referenced this pull request Feb 11, 2025
… override parent method (elastic#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.

(cherry picked from commit 89ba03e)

# Conflicts:
#	muted-tests.yml
#	x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java
@parkertimmins
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
9.0

Questions ?

Please refer to the Backport tool documentation

parkertimmins added a commit to parkertimmins/elasticsearch that referenced this pull request Feb 11, 2025
… override parent method (elastic#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.

(cherry picked from commit 89ba03e)

# Conflicts:
#	muted-tests.yml
elasticsearchmachine pushed a commit that referenced this pull request Feb 11, 2025
… 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
elasticsearchmachine pushed a commit that referenced this pull request Feb 11, 2025
…oes not override parent method (#122209) (#122259)

* 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.

(cherry picked from commit 89ba03e)

# Conflicts:
#	muted-tests.yml
#	x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java

* deletePipeline not available in 8.x
elasticsearchmachine pushed a commit that referenced this pull request Feb 11, 2025
…es not override parent method (#122209) (#122258)

* 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.

(cherry picked from commit 89ba03e)

# Conflicts:
#	muted-tests.yml
#	x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java

* deletePipeline not available in 8.x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants