Don't start a new node in InternalTestCluster#getClient
#127318
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This method would default to starting a new node when the cluster was empty. This is pretty trappy as `getClient()` (or things like `getMaster()` that depend on `getClient()`) don't look at all like something that would start a new node. In any case, the intention of tests is much clearer when they explicitly define a cluster configuration.
elasticsearchmachine
added
serverless-linked
nielsbauman
commented
Apr 24, 2025
| @@ -57,7 +57,7 @@ | |||
| /** | |||
| * An integration test that verifies how different paths/scenarios affect the APM metrics for failure stores. | |||
| */ | |||
| @ESIntegTestCase.ClusterScope(numDataNodes = 0, numClientNodes = 0, scope = ESIntegTestCase.Scope.SUITE) | |||
| @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 1, numClientNodes = 0, supportsDedicatedMasters = false) | |||
There was a problem hiding this comment.
Some tests depend on there being exactly one node in the cluster, which I solved like this.
|
|
||
| import java.util.Collection; | ||
|
|
||
| @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0) |
There was a problem hiding this comment.
Some tests didn't actually need any specific cluster configuration.
| @@ -33,8 +33,6 @@ private Settings.Builder nodeSettingsBuilder(int nodeOrdinal, Settings otherSett | |||
| } | |||
|
|
|||
| public void testClusterRestartWithLicense() throws Exception { | |||
| wipeAllLicenses(); | |||
There was a problem hiding this comment.
Wiping the licenses before the test starts doesn't make sense if we start with an empty cluster (i.e. no nodes).
nielsbauman
added
Team:Distributed Coordination
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This method would default to starting a new node when the cluster was empty. This is pretty trappy as
getClient()(or things likegetMaster()that depend ongetClient()) don't look at all like something that would start a new node.In any case, the intention of tests is much clearer when they explicitly define a cluster configuration.