Apache Solr open-source search software
SOLR-15474: three more code review tweaks (#1870)
Christine Poerschkeed922011cb4d
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.javaindex 52a839ce7a6..201b1ffaa73 100644--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java@@ -51,7 +51,10 @@ public class CircuitBreakerManager extends CircuitBreaker {public String getDebugInfo() {StringBuilder sb = new StringBuilder();if (memEnabled) {- sb.append(memCB.getDebugInfo()).append("\n");+ sb.append(memCB.getDebugInfo());+ }+ if (memEnabled && cpuEnabled) {+ sb.append("\n");}if (cpuEnabled) {sb.append(cpuCB.getDebugInfo());diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.javaindex 283203e0f9b..0cb3fb0a378 100644--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java@@ -99,9 +99,4 @@ public class CircuitBreakerRegistry {public boolean isEnabled() {return !circuitBreakerList.isEmpty();}-- @VisibleForTesting- public List<CircuitBreaker> getRegisteredCircuitBreakers() {- return circuitBreakerList;- }}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 8b27d4fd573..660e7952e70 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">- <int name="threshold">75</int>+ <double name="threshold">75</double></circuitBreaker><circuitBreaker class="solr.CPUCircuitBreaker">diff --git a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.javaindex 8e3231f0341..372ddf80810 100644--- a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java+++ b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java@@ -239,10 +239,7 @@ public abstract class BaseTestCircuitBreaker extends SolrTestCaseJ4 {}private void removeAllExistingCircuitBreakers() {- List<CircuitBreaker> registeredCircuitBreakers =- h.getCore().getCircuitBreakerRegistry().getRegisteredCircuitBreakers();-- registeredCircuitBreakers.clear();+ h.getCore().getCircuitBreakerRegistry().deregisterAll();}private static class MockCircuitBreaker extends MemoryCircuitBreaker {