SOLR-17141: Create CpuQueryLimit implementation #2244
Merged
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
dsmiley
requested changes
Feb 13, 2024
solr/core/src/java/org/apache/solr/search/CpuQueryTimeLimit.java
Outdated
Show resolved
Hide resolved
solr/core/src/java/org/apache/solr/search/CpuQueryTimeLimit.java
Outdated
Show resolved
Hide resolved
solr/core/src/test-files/solr/configsets/query-limits/conf/schema.xml
Outdated
Show resolved
Hide resolved
| import org.apache.solr.handler.component.ResponseBuilder; | ||
| import org.apache.solr.handler.component.SearchComponent; | ||
|
|
||
| public class ExpensiveSearchComponent extends SearchComponent { |
There was a problem hiding this comment.
Looking forward to seeing this on https://solr.cool/ :-)
solr/core/src/test/org/apache/solr/search/TestCpuQueryTimeLimit.java
Outdated
Show resolved
Hide resolved
gus-asf
requested changes
Feb 14, 2024
solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java
Outdated
Show resolved
Hide resolved
solr/core/src/java/org/apache/solr/search/CpuQueryTimeLimit.java
Outdated
Show resolved
Hide resolved
solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
Outdated
Show resolved
Hide resolved
solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
Outdated
Show resolved
Hide resolved
| @@ -622,8 +622,8 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw | |||
| } while (nextStage != Integer.MAX_VALUE); | |||
|
|
|||
| if (publishCpuTime) { | |||
| rsp.getResponseHeader().add(ThreadStats.CPU_TIME, totalShardCpuTime); | |||
| rsp.addToLog(ThreadStats.CPU_TIME, totalShardCpuTime); | |||
| rsp.getResponseHeader().add(ThreadCpuTime.CPU_TIME, totalShardCpuTime); | |||
There was a problem hiding this comment.
Do you mean for the responseHeader?
* Improve the ExpensiveSearchComponent to produce consistent CPU load * Use SolrJettyTestRule instead of full mini cloud cluster.
github-actions
bot
added
the
documentation
Clean up and document the ExpensiveSearchComponent. Support adding load at different stages of distrib processing.
dsmiley
approved these changes
Feb 16, 2024
| public static void setup() throws Exception { | ||
| System.setProperty(ThreadCpuTimer.ENABLE_CPU_TIME, "true"); | ||
| Path configset = createConfigSet(); | ||
| configureCluster(2).addConfig("conf", configset).configure(); |
There was a problem hiding this comment.
Do we actually need 2 nodes to test this? (Trying to keep tests as lean as needed to test what they need to test; no more)
There was a problem hiding this comment.
Probably not at the moment... My thinking was that if/when we want to add more complex tests that trigger termination at various stages in the distrib processing then it's best to also include inter-node communication in the setup. We're not there yet so I can reduce it to 1 node.
dsmiley
approved these changes
Feb 17, 2024
gus-asf
approved these changes
Feb 19, 2024
sigram
added a commit
to sigram/solr
that referenced
this pull request
Feb 20, 2024
* Refactor to fix ThreadStats / ThreadCpuTime nesting and use it in CpuQueryTimeLimit. * Rename classes to better reflect the type of limit.
sigram
added a commit
that referenced
this pull request
Feb 20, 2024
* SOLR-17141: Create CpuQueryLimit implementation (#2244) * Refactor to fix ThreadStats / ThreadCpuTimer nesting and use it in CpuQueryTimeLimit. * Rename classes to better reflect the type of limit.
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.
Details in Jira. This builds on top of changes in #2237.