cpoerschke commented on code in PR #2069:
URL: https://github.com/apache/solr/pull/2069#discussion_r1389150928


##########
solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc:
##########
@@ -32,8 +32,25 @@ Setting the `shards.tolerant=true` parameter on requests can 
help with graceful
 circuit breaker thresholds are reached on some nodes. See the 
<<shards.tolerant Parameter>> for details.
 
 == Circuit Breaker Configurations
-All circuit breaker configurations are listed as independent 
`<circuitBreaker>` entries in `solrconfig.xml` as shown below.
-A circuit breaker can register itself to trip for query requests and/or update 
requests. By default only search requests are affected. A user may register 
multiple circuit breakers of the same type with different thresholds for each 
request type.
+Circuit breakers can be configured globally for the entire node, or for each 
collection individually, or a combination. Per-collection circit breakers take 
precedence over global circuit breakers.

Review Comment:
   ```suggestion
   Circuit breakers can be configured globally for the entire node, or for each 
collection individually, or a combination. Per-collection circuit breakers are 
checked before global circuit breakers.
   ```
   
   Both per-collection and global CBs are checked, right? Hmm, not quite sure 
how to best convey that though.



##########
solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc:
##########
@@ -32,8 +32,25 @@ Setting the `shards.tolerant=true` parameter on requests can 
help with graceful
 circuit breaker thresholds are reached on some nodes. See the 
<<shards.tolerant Parameter>> for details.
 
 == Circuit Breaker Configurations
-All circuit breaker configurations are listed as independent 
`<circuitBreaker>` entries in `solrconfig.xml` as shown below.
-A circuit breaker can register itself to trip for query requests and/or update 
requests. By default only search requests are affected. A user may register 
multiple circuit breakers of the same type with different thresholds for each 
request type.
+Circuit breakers can be configured globally for the entire node, or for each 
collection individually, or a combination. Per-collection circit breakers take 
precedence over global circuit breakers.
+
+A circuit breaker can register itself to trip for query requests and/or update 
requests. A user may register multiple circuit breakers of the same type with 
different thresholds for each request type.

Review Comment:
   ```suggestion
   A circuit breaker can register itself to be checked for query requests 
and/or update requests. A user may register multiple circuit breakers of the 
same type with different thresholds for each request type.
   ```
   
   or
   
   ```suggestion
   A circuit breaker can register itself for query requests and/or update 
requests. A user may register multiple circuit breakers of the same type with 
different thresholds for each request type.
   ```



##########
solr/solr-ref-guide/modules/deployment-guide/pages/circuit-breakers.adoc:
##########
@@ -52,13 +69,20 @@ The main configuration for this circuit breaker is 
controlling the threshold per
 
 To enable and configure the JVM heap usage based circuit breaker, add the 
following:
 
+.Per collection in `solrconfig.xml`
 [source,xml]
 ----
 <circuitBreaker 
class="org.apache.solr.util.circuitbreaker.MemoryCircuitBreaker">
  <double name="threshold">75</double>
 </circuitBreaker>
 ----
 
+.Global in `solr.in.sh`
+[source,bash]
+----
+SOLR_CIRCUITBREAKER_QUERY_HEAP=75

Review Comment:
   ```suggestion
   SOLR_CIRCUITBREAKER_QUERY_MEM=75
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to