[solr] branch main updated: SOLR-16954: Fix test failures caused by update circuit breaker (#1918)

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 729b4979a39 SOLR-16954: Fix test failures caused by update circuit breaker (#1918)
729b4979a39 is described below

commit 729b4979a395e48f9e171281ecf4db67a0493e9e
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Thu Sep 14 09:02:04 2023 +0200

    SOLR-16954: Fix test failures caused by update circuit breaker (#1918)
---
 solr/core/src/test/org/apache/solr/util/BaseTestCircuitBreaker.java | 3 ++-
 1 file changed, 2 insertions(+), 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
index 025db34ed76..68ee7f4ae3a 100644
--- 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 abstract class BaseTestCircuitBreaker extends SolrTestCaseJ4 {
         CircuitBreaker.getErrorCode(List.of(new MemoryCircuitBreaker())));
   }
 
-  private void removeAllExistingCircuitBreakers() {
+  private static void removeAllExistingCircuitBreakers() {
     h.getCore().getCircuitBreakerRegistry().deregisterAll();
   }