You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by cp...@apache.org on 2023/08/29 12:40:18 UTC
[solr] branch branch_9x updated: SOLR-15474: three more code review tweaks (#1870)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 0bdb06f6686 SOLR-15474: three more code review tweaks (#1870)
0bdb06f6686 is described below
commit 0bdb06f6686896e25af38266dd029c07c1bdb8d5
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Tue Aug 29 13:38:08 2023 +0100
SOLR-15474: three more code review tweaks (#1870)
(cherry picked from commit ed922011cb4d8b44350d851eecd96652e2a35f77)
---
.../org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java | 5 ++++-
.../org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java | 5 -----
.../solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml | 2 +-
solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java | 5 +----
4 files changed, 6 insertions(+), 11 deletions(-)
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.java
index 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.java
index 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.xml
index 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.java
index 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 {