SOLR-17453: Drop CloudUtil.waitForState() in favor of common waitForState() #2716
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.
https://issues.apache.org/jira/browse/SOLR-17453
(this does not fully address the ticket)
Description
Method
CloudUtil.waitForState()
does use a Zookeeper watch, but it does active polling of the collection state. This change is in test code only.Solution
Update tests so they use the standard
waitForState()
, relying on a Zookeeper watch, instead of actively polling the collection state.I removed method
CloudUtil.waitForState()
.Also removed
CloudUtil.clusterShape()
as it is unused. The correct one is inSolrCloudTestCase
and already used everywhere. This makes test code a little less bloated.Tests
This change is in only test code.
Checklist
Please review the following and check all that apply:
main
branch../gradlew check
.