SOLR-17945: fix flaky test CloudHttp2SolrClientTest#testHttpCspPerf #3742
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
- create staic constant for sys prop (will cause test compile errors if removed in future) - cleanup sys prop in @afterclass in ClusterStateProviderTest - set sys prop to very high number in testHttpCspPerf to prevent spurious CLUSTERSTATUS requests
…tting the sys prop
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a flaky test CloudHttp2SolrClientTest#testHttpCspPerf by refactoring the system property used to control the Cluster State Provider's cache timeout and properly managing its lifecycle in tests.
- Extracts the hardcoded system property string into a constant for better maintainability
- Adds proper cleanup of system properties in test classes to prevent test pollution
- Sets an extremely high cache timeout in the performance test to prevent background cache refreshes from interfering
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| BaseHttpClusterStateProvider.java | Defines constant for cache timeout system property and uses it instead of hardcoded string |
| ClusterStateProviderTest.java | Uses the new constant and adds proper cleanup of system property after tests |
| CloudHttp2SolrClientTest.java | Uses the new constant and wraps test with try-finally to ensure system property cleanup |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
solr/solrj/src/test/org/apache/solr/client/solrj/impl/ClusterStateProviderTest.java
Outdated
Show resolved
Hide resolved
solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
Outdated
Show resolved
Hide resolved
…tateProviderTest.java Co-authored-by: Copilot <[email protected]>
…p2SolrClientTest.java Co-authored-by: Copilot <[email protected]>
dsmiley
reviewed
Oct 8, 2025
| } | ||
| } | ||
| } finally { | ||
| System.clearProperty(SYS_PROP_CACHE_TIMEOUT_SECONDS); |
There was a problem hiding this comment.
Please don't bother clearing system properties in tests. We've got some nice test infrastructure that makes doing so needless, and here causing you to do a needless try-finally.
asf-gitbox-commits
pushed a commit
that referenced
this pull request
Oct 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 fixes the
CloudHttp2SolrClientTest#testHttpCspPerfby increasing the Cluster State Provider's cache timeout.