SOLR-16954: Fix test failures caused by update circuit breaker (#1918)

(cherry picked from commit 729b497)
apache · Sep 14, 2023 · 1f739f0 · 1f739f0
1 parent 2271b37
commit 1f739f0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java b/solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java
@@ -43,6 +43,7 @@ public abstract class BaseTestCircuitBreaker extends SolrTestCaseJ4 {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   protected static void indexDocs() {
+    removeAllExistingCircuitBreakers();
     for (int i = 0; i < 20; i++) {
       assertU(adoc("name", "john smith", "id", "1"));
       assertU(adoc("name", "johathon smith", "id", "2"));
@@ -269,7 +270,7 @@ public void testErrorCode() {
         CircuitBreaker.getErrorCode(List.of(new MemoryCircuitBreaker())));
   }
 
-  private void removeAllExistingCircuitBreakers() {
+  private static void removeAllExistingCircuitBreakers() {
     h.getCore().getCircuitBreakerRegistry().deregisterAll();
   }