cb is back

Author: original-brownbear

server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java

@@ -23,8 +23,6 @@
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.common.breaker.CircuitBreaker;
-import org.elasticsearch.common.breaker.NoopCircuitBreaker;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -548,8 +546,6 @@ private void onNodeQueryFailure(Exception e, NodeQueryRequest request, CanMatchP
 
     private static final String NODE_SEARCH_ACTION_NAME = "indices:data/read/search[query][n]";
 
-    private static final CircuitBreaker NOOP_CIRCUIT_BREAKER = new NoopCircuitBreaker("request");
-
     static void registerNodeSearchAction(
         SearchTransportService searchTransportService,
         SearchService searchService,
@@ -573,7 +569,7 @@ static void registerNodeSearchAction(
                     new QueryPhaseResultConsumer(
                         request.searchRequest,
                         dependencies.executor,
-                        NOOP_CIRCUIT_BREAKER, // noop cb for now since we do not have a breaker in this situation in un-batched execution
+                        searchService.getCircuitBreaker(),
                         searchPhaseController,
                         cancellableTask::isCancelled,
                         SearchProgressListener.NOOP,

server/src/main/java/org/elasticsearch/search/SearchService.java

@@ -421,6 +421,10 @@ public SearchService(
             .addSettingsUpdateConsumer(MEMORY_ACCOUNTING_BUFFER_SIZE, newValue -> this.memoryAccountingBufferSize = newValue.getBytes());
     }
 
+    public CircuitBreaker getCircuitBreaker() {
+        return circuitBreaker;
+    }
+
     private void setEnableSearchWorkerThreads(boolean enableSearchWorkerThreads) {
         if (enableSearchWorkerThreads) {
             searchExecutor = threadPool.executor(Names.SEARCH);