Apache Solr open-source search software
SOLR-16954: Fix test failure in UPDATE circuit breaker (#1896)
Jan Høydahlaeea7bcd1e07
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.javaindex 3e9cf47a2e5..262bd80444d 100644--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java@@ -89,7 +89,7 @@ public class CPUCircuitBreaker extends CircuitBreaker {@Overridepublic 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 "diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.javaindex 49311ddc934..0a568e5bf9e 100644--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java@@ -89,7 +89,7 @@ public class MemoryCircuitBreaker extends CircuitBreaker {@Overridepublic 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 "diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xmlindex ad0efe5a444..8719a00ea7b 100644--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml@@ -79,7 +79,7 @@</query><circuitBreaker class="solr.MemoryCircuitBreaker">- <double name="threshold">75</double>+ <double name="threshold">99</double><arr name="requestTypes"><str>update</str></arr>