From eb497adb2035e140e5a187987a4d3f64a5a7fcb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Thu, 7 Sep 2023 17:15:28 +0200
Subject: [PATCH 1/3] SOLR-16954: Remove unintended UPDATE breaker from test
 config

---
 .../conf/solrconfig-pluggable-circuitbreaker.xml           | 7 -------
 1 file changed, 7 deletions(-)

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 ad0efe5a444..ec087b214b7 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
@@ -78,13 +78,6 @@
 
   </query>
 
-  <circuitBreaker class="solr.MemoryCircuitBreaker">
-    <double  name="threshold">75</double>
-    <arr name="requestTypes">
-      <str>update</str>
-    </arr>
-  </circuitBreaker>
-
   <circuitBreaker class="solr.MemoryCircuitBreaker">
     <double  name="threshold">80</double>
 <!-- Default is query

From 355c36e378d860cae1080560299bbfaedf8c964f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Thu, 7 Sep 2023 17:25:42 +0200
Subject: [PATCH 2/3] SOLR-16954: Fix missing whitespace in string
 concatenation

---
 .../org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java  | 2 +-
 .../apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
index 3e9cf47a2e5..262bd80444d 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CPUCircuitBreaker.java
@@ -89,7 +89,7 @@ public String getDebugInfo() {
 
   @Override
   public String getErrorMessage() {
-    return "CPU Circuit Breaker triggered as seen CPU usage is above allowed threshold."
+    return "CPU Circuit Breaker triggered as seen CPU usage is above allowed threshold. "
         + "Seen CPU usage "
         + seenCPUUsage.get()
         + " and allocated threshold "
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
index 49311ddc934..0a568e5bf9e 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
@@ -89,7 +89,7 @@ public String getDebugInfo() {
 
   @Override
   public String getErrorMessage() {
-    return "Memory Circuit Breaker triggered as JVM heap usage values are greater than allocated threshold."
+    return "Memory Circuit Breaker triggered as JVM heap usage values are greater than allocated threshold. "
         + "Seen JVM heap memory usage "
         + seenMemory.get()
         + " and allocated threshold "

From bb2db7ebe3f73bc32657ef994a30095d527b75cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= <janhoy@users.noreply.github.com>
Date: Thu, 7 Sep 2023 22:17:45 +0200
Subject: [PATCH 3/3] SOLR-16954: Re-add mem-CB for updates, with 99% threshold

---
 .../conf/solrconfig-pluggable-circuitbreaker.xml           | 7 +++++++
 1 file changed, 7 insertions(+)

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 ec087b214b7..8719a00ea7b 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
@@ -78,6 +78,13 @@
 
   </query>
 
+  <circuitBreaker class="solr.MemoryCircuitBreaker">
+    <double  name="threshold">99</double>
+    <arr name="requestTypes">
+      <str>update</str>
+    </arr>
+  </circuitBreaker>
+
   <circuitBreaker class="solr.MemoryCircuitBreaker">
     <double  name="threshold">80</double>
 <!-- Default is query