Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SOLR-16954: Fix test failure in UPDATE circuit breaker #1896

Merged
merged 3 commits into from
Sep 7, 2023
Merged

SOLR-16954: Fix test failure in UPDATE circuit breaker #1896

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb497ad
SOLR-16954: Remove unintended UPDATE breaker from test config
janhoy Sep 7, 2023
355c36e
SOLR-16954: Fix missing whitespace in string concatenation
janhoy Sep 7, 2023
bb2db7e
SOLR-16954: Re-add mem-CB for updates, with 99% threshold
janhoy Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public String getDebugInfo() {

@Override
public String getErrorMessage() {
return "CPU Circuit Breaker triggered as seen CPU usage is above allowed threshold."
return "CPU Circuit Breaker triggered as seen CPU usage is above allowed threshold. "
+ "Seen CPU usage "
+ seenCPUUsage.get()
+ " and allocated threshold "
Expand Down
2 changes: 1 addition & 1 deletion solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public String getDebugInfo() {

@Override
public String getErrorMessage() {
return "Memory Circuit Breaker triggered as JVM heap usage values are greater than allocated threshold."
return "Memory Circuit Breaker triggered as JVM heap usage values are greater than allocated threshold. "
+ "Seen JVM heap memory usage "
+ seenMemory.get()
+ " and allocated threshold "
Expand Down
7 changes: 0 additions & 7 deletions solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,6 @@

</query>

<circuitBreaker class="solr.MemoryCircuitBreaker">
<double name="threshold">75</double>
<arr name="requestTypes">
<str>update</str>
</arr>
</circuitBreaker>

<circuitBreaker class="solr.MemoryCircuitBreaker">
<double name="threshold">80</double>
<!-- Default is query
Expand Down