[TEST] randomly introduced a client node within test cluster #5949
Conversation
This file contains 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
The default number of clients nodes is 1, applied to all cluster scopes (global, suite and test). Can be disabled though through the newly added `@ClusterScope#numClientNodes`. In our tests we currently refer to nodes in a generic way. All the tests that either stop or start nodes rely on the fact that those nodes hold data though. Made that clearer as that becomes more important when introducing other types of nodes within the test cluster. Reflected this by adapting and renaming the following methods: - ensureAtLeastNumNodes to ensureAtLeastNumDataNodes - ensureAtMostNumNodes to ensureAtMostNumDataNodes - stopRandomNode to stopRandomDataNode Added facilities to be able to deal with data nodes specifically, like for instance retrieve a client to a data node, or retrieve an instance of a class through guice only from data nodes. Renamed also `dataNodes` method to `numDataNodes`. Adapted existing tests to successfully run although there's a node client around. Fixed _cat/allocation REST tests to make disk.total, disk.avail and disk.percent optional as client nodes won't return that info.
| this.numSharedDataNodes = minNumDataNodes; | ||
| } else { | ||
| this.numSharedDataNodes = minNumDataNodes + random.nextInt(maxNumDataNodes - minNumDataNodes); | ||
| } |
There was a problem hiding this comment.
numSharedDataNodes = RandomInts.randomIntBetween(minNumDataNodes, maxNumDataNodes)?
There was a problem hiding this comment.
good point :) not that I changed this line in this PR (just moved it) but it's worth doing what you suggest!
…aNodes, minNumDataNodes and maxNumDataNodes
|
Hey @jpountz I added a couple of commits, the first one addresses your comments, the second one completes the renaming work, since I found some leftover |
| this.numSharedDataNodes = minNumDataNodes; | ||
| } else { | ||
| this.numSharedDataNodes = RandomInts.randomIntBetween(random, minNumDataNodes, maxNumDataNodes); | ||
| } |
There was a problem hiding this comment.
But then, I think we don't need the if statement anymore?
|
LGTM |
…mClientNodes to -1, meaning that it will be randomized between 0 and 1 unless specified
javanna
added a commit
that referenced
this pull request
Apr 28, 2014
The default number of clients nodes is randomized between 0 and 1, applied to all cluster scopes (global, suite and test). Can be changed through the newly added `@ClusterScope#numClientNodes`. In our tests we currently refer to nodes in a generic way. All the tests that either stop or start nodes rely on the fact that those nodes hold data though. Made that clearer as that becomes more important when introducing other types of nodes within the test cluster. Reflected this by adapting and renaming the following methods in `TestCluster`: - ensureAtLeastNumNodes to ensureAtLeastNumDataNodes - ensureAtMostNumNodes to ensureAtMostNumDataNodes - stopRandomNode to stopRandomDataNode and the following ones in `ElasticsearchIntegrationTest`: - allowNodes to allowDataNodes - dataNodes to numDataNodes. - @ClusterScope#numNodes to numDataNodes - @ClusterScope#minNumNodes to minNumDataNodes - @ClusterScope#maxNumNodes to maxNumDataNodes Added facilities to be able to deal with data nodes specifically, like for instance retrieve a client to a data node, or retrieve an instance of a class through guice only from data nodes. Adapted existing tests to successfully run although there's a node client around. Fixed _cat/allocation REST tests to make disk.total, disk.avail and disk.percent optional as client nodes won't return that info. Closes #5949
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.
The default number of clients nodes is 1, applied to all cluster scopes (global, suite and test). Can be changed though through the newly added
@ClusterScope#numClientNodes.In our tests we currently refer to nodes in a generic way. All the tests that either stop or start nodes rely on the fact that those nodes hold data though. Made that clearer as that becomes more important when introducing other types of nodes within the test cluster. Reflected this by adapting and renaming the following methods in
TestCluster:ensureAtLeastNumNodestoensureAtLeastNumDataNodesensureAtMostNumNodestoensureAtMostNumDataNodesstopRandomNodetostopRandomDataNodeand the following ones in
ElasticsearchIntegrationTest:dataNodestonumDataNodes.@ClusterScope#numNodestonumDataNodes@ClusterScope#minNumNodestominNumDataNodes@ClusterScope#maxNumNodestomaxNumDataNodesAdded facilities to be able to deal with data nodes specifically, like for instance retrieve a client to a data node, or retrieve an instance of a class through guice only from data nodes.
Adapted existing tests to successfully run although there's a node client around.
Fixed _cat/allocation REST tests to make disk.total, disk.avail and disk.percent optional as client nodes won't return that info.