Apache Solr open-source search software
SOLR-17761: Prevent CircuitBreakerRegistry static init races (#3349)
Jason Gerlowski68423b576cc6
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 2a58dd1560b..51e38d4dfd7 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -282,6 +282,8 @@ Bug Fixes* SOLR-17745: Cancel leader election was being skipped on core container shutdown due to incorrect zkClient check (Matthew Biscocho, Luke Kot-Zaniewski)+* SOLR-17761: Global circuit breakers can no longer trigger ConcurrentModificationException's on Solr startup (Jason Gerlowski)+Dependency Upgrades---------------------* SOLR-17471: Upgrade Lucene to 9.12.1. (Pierre Salagnac, Christine Poerschke)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 d602706a2cd..91e284b823f 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@@ -27,6 +27,7 @@ import java.util.List;import java.util.Locale;import java.util.Map;import java.util.Set;+import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.atomic.AtomicInteger;import java.util.regex.Matcher;import java.util.regex.Pattern;@@ -51,7 +52,7 @@ public class CircuitBreakerRegistry implements Closeable {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());private final Map<SolrRequestType, List<CircuitBreaker>> circuitBreakerMap = new HashMap<>();private static final Map<SolrRequestType, List<CircuitBreaker>> globalCircuitBreakerMap =- new HashMap<>();+ new ConcurrentHashMap<>();private static final Pattern SYSPROP_REGEX =Pattern.compile("solr.circuitbreaker\\.(update|query)\\.(cpu|mem|loadavg)");public static final String SYSPROP_PREFIX = "solr.circuitbreaker.";