Skip to content

Commit

Permalink
Revert canTripCircuitBreaker change
Browse files Browse the repository at this point in the history
No need for callers to specify `canTripCircuitBreaker`, the default for
this is safe.
  • Loading branch information
DaveCTurner committed Oct 3, 2023
1 parent df45d4b commit 0f18e27
Show file tree
Hide file tree
Showing 180 changed files with 95 additions and 420 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class TransportNoopBulkAction extends HandledTransportAction<BulkRequest,

@Inject
public TransportNoopBulkAction(TransportService transportService, ActionFilters actionFilters) {
super(NoopBulkAction.NAME, true, transportService, actionFilters, BulkRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(NoopBulkAction.NAME, transportService, actionFilters, BulkRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class TransportNoopSearchAction extends HandledTransportAction<SearchRequ
public TransportNoopSearchAction(TransportService transportService, ActionFilters actionFilters) {
super(
NoopSearchAction.NAME,
true,
transportService,
actionFilters,
(Writeable.Reader<SearchRequest>) SearchRequest::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public TransportAction(TransportService transportService, ActionFilters actionFi
PatternBank legacyGrokPatterns,
PatternBank ecsV1GrokPatterns
) {
super(NAME, true, transportService, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(NAME, transportService, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.legacyGrokPatterns = legacyGrokPatterns.bank();
this.sortedLegacyGrokPatterns = new TreeMap<>(this.legacyGrokPatterns);
this.ecsV1GrokPatterns = ecsV1GrokPatterns.bank();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ public TransportMultiSearchTemplateAction(
) {
super(
MultiSearchTemplateAction.NAME,
true,
transportService,
actionFilters,
MultiSearchTemplateRequest::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,7 @@ public TransportSearchTemplateAction(
NodeClient client,
UsageService usageService
) {
super(
SearchTemplateAction.NAME,
true,
transportService,
actionFilters,
SearchTemplateRequest::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
super(SearchTemplateAction.NAME, transportService, actionFilters, SearchTemplateRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.scriptService = scriptService;
this.xContentRegistry = xContentRegistry;
this.client = client;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,7 @@ public static class TransportAction extends HandledTransportAction<Request, Resp

@Inject
public TransportAction(TransportService transportService, ActionFilters actionFilters, PainlessScriptEngine painlessScriptEngine) {
super(
NAME,
true,
transportService,
actionFilters,
(Writeable.Reader<Request>) Request::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
super(NAME, transportService, actionFilters, (Writeable.Reader<Request>) Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.painlessScriptEngine = painlessScriptEngine;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public TransportRankEvalAction(
ScriptService scriptService,
NamedXContentRegistry namedXContentRegistry
) {
super(RankEvalAction.NAME, true, transportService, actionFilters, RankEvalRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(RankEvalAction.NAME, transportService, actionFilters, RankEvalRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.scriptService = scriptService;
this.namedXContentRegistry = namedXContentRegistry;
this.client = client;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,7 @@ public TransportDeleteByQueryAction(
ScriptService scriptService,
ClusterService clusterService
) {
super(
DeleteByQueryAction.NAME,
true,
transportService,
actionFilters,
DeleteByQueryRequest::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
super(DeleteByQueryAction.NAME, transportService, actionFilters, DeleteByQueryRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.threadPool = threadPool;
this.client = client;
this.scriptService = scriptService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ protected TransportReindexAction(
TransportService transportService,
ReindexSslConfig sslConfig
) {
super(name, true, transportService, actionFilters, ReindexRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(name, transportService, actionFilters, ReindexRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.client = client;
this.reindexValidator = new ReindexValidator(settings, clusterService, indexNameExpressionResolver, autoCreateIndex);
this.reindexer = new Reindexer(clusterService, client, threadPool, scriptService, sslConfig);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,7 @@ public TransportUpdateByQueryAction(
ScriptService scriptService,
ClusterService clusterService
) {
super(
UpdateByQueryAction.NAME,
true,
transportService,
actionFilters,
UpdateByQueryRequest::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
super(UpdateByQueryAction.NAME, transportService, actionFilters, UpdateByQueryRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.threadPool = threadPool;
this.client = client;
this.scriptService = scriptService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public TransportMainAction(
ActionFilters actionFilters,
ClusterService clusterService
) {
super(MainAction.NAME, true, transportService, actionFilters, MainRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(MainAction.NAME, transportService, actionFilters, MainRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.nodeName = Node.NODE_NAME_SETTING.get(settings);
this.clusterService = clusterService;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public TestTransportAction(
PluginsService pluginsService,
ThreadPool threadPool
) {
super(NAME, true, transportService, actionFilters, in -> new TestRequest(), EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(NAME, transportService, actionFilters, in -> new TestRequest(), EsExecutors.DIRECT_EXECUTOR_SERVICE);
testPlugin = pluginsService.filterPlugins(TestPlugin.class).get(0);
this.threadPool = threadPool;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public static class TransportAction extends HandledTransportAction<Request, Resp

@Inject
public TransportAction(TransportService transportService, ActionFilters actionFilters, MasterHistoryService masterHistoryService) {
super(MasterHistoryAction.NAME, true, transportService, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(MasterHistoryAction.NAME, transportService, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.masterHistoryService = masterHistoryService;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public TransportGetTaskAction(
Client client,
NamedXContentRegistry xContentRegistry
) {
super(GetTaskAction.NAME, true, transportService, actionFilters, GetTaskRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(GetTaskAction.NAME, transportService, actionFilters, GetTaskRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.threadPool = threadPool;
this.clusterService = clusterService;
this.transportService = transportService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public static class TransportAction extends HandledTransportAction<Request, Resp

@Inject
public TransportAction(TransportService transportService, ActionFilters actionFilters) {
super(RemoteClusterNodesAction.NAME, true, transportService, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(RemoteClusterNodesAction.NAME, transportService, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.transportService = transportService;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public TransportRemoteInfoAction(
ActionFilters actionFilters,
SearchTransportService searchTransportService
) {
super(RemoteInfoAction.NAME, true, transportService, actionFilters, RemoteInfoRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(RemoteInfoAction.NAME, transportService, actionFilters, RemoteInfoRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.remoteClusterService = searchTransportService.getRemoteClusterService();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public class TransportGetScriptContextAction extends HandledTransportAction<GetS
public TransportGetScriptContextAction(TransportService transportService, ActionFilters actionFilters, ScriptService scriptService) {
super(
GetScriptContextAction.NAME,
true,
transportService,
actionFilters,
GetScriptContextRequest::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public class TransportGetScriptLanguageAction extends HandledTransportAction<Get
public TransportGetScriptLanguageAction(TransportService transportService, ActionFilters actionFilters, ScriptService scriptService) {
super(
GetScriptLanguageAction.NAME,
true,
transportService,
actionFilters,
GetScriptLanguageRequest::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public TransportImportDanglingIndexAction(
) {
super(
ImportDanglingIndexAction.NAME,
true,
transportService,
actionFilters,
ImportDanglingIndexRequest::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public TransportGetFieldMappingsAction(
) {
super(
GetFieldMappingsAction.NAME,
true,
transportService,
actionFilters,
GetFieldMappingsRequest::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ public TransportAction(
ActionFilters actionFilters,
IndexNameExpressionResolver indexNameExpressionResolver
) {
super(NAME, true, transportService, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(NAME, transportService, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.threadPool = threadPool;
this.clusterService = clusterService;
this.remoteClusterService = transportService.getRemoteClusterService();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ protected TransportSingleItemBulkWriteAction(
Writeable.Reader<Request> requestReader,
TransportBulkAction bulkAction
) {
super(actionName, true, transportService, actionFilters, requestReader, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(actionName, transportService, actionFilters, requestReader, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.bulkAction = bulkAction;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public TransportMultiGetAction(
IndexNameExpressionResolver resolver,
IndicesService indicesService
) {
super(MultiGetAction.NAME, true, transportService, actionFilters, MultiGetRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(MultiGetAction.NAME, transportService, actionFilters, MultiGetRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.clusterService = clusterService;
this.client = client;
this.indexNameExpressionResolver = resolver;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ public SimulatePipelineTransportAction(
) {
super(
SimulatePipelineAction.NAME,
true,
transportService,
actionFilters,
SimulatePipelineRequest::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public TransportClearScrollAction(
ActionFilters actionFilters,
SearchTransportService searchTransportService
) {
super(ClearScrollAction.NAME, true, transportService, actionFilters, ClearScrollRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(ClearScrollAction.NAME, transportService, actionFilters, ClearScrollRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.clusterService = clusterService;
this.searchTransportService = searchTransportService;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public TransportClosePointInTimeAction(
) {
super(
ClosePointInTimeAction.NAME,
true,
transportService,
actionFilters,
ClosePointInTimeRequest::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public TransportMultiSearchAction(
) {
super(
MultiSearchAction.NAME,
true,
transportService,
actionFilters,
(Writeable.Reader<MultiSearchRequest>) MultiSearchRequest::new,
Expand All @@ -73,7 +72,6 @@ public TransportMultiSearchAction(
) {
super(
MultiSearchAction.NAME,
true,
transportService,
actionFilters,
(Writeable.Reader<MultiSearchRequest>) MultiSearchRequest::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public TransportOpenPointInTimeAction(
) {
super(
OpenPointInTimeAction.NAME,
true,
transportService,
actionFilters,
OpenPointInTimeRequest::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ public TransportSearchAction(
) {
super(
SearchAction.NAME,
true,
transportService,
actionFilters,
(Writeable.Reader<SearchRequest>) SearchRequest::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,7 @@ public TransportSearchScrollAction(
ActionFilters actionFilters,
SearchTransportService searchTransportService
) {
super(
SearchScrollAction.NAME,
true,
transportService,
actionFilters,
SearchScrollRequest::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
super(SearchScrollAction.NAME, transportService, actionFilters, SearchScrollRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.clusterService = clusterService;
this.searchTransportService = searchTransportService;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected HandledTransportAction(
ActionFilters actionFilters,
Writeable.Reader<Request> requestReader
) {
this(actionName, true, transportService, actionFilters, requestReader, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this(actionName, transportService, actionFilters, requestReader, EsExecutors.DIRECT_EXECUTOR_SERVICE);
}

protected HandledTransportAction(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ protected ReservedStateAwareHandledTransportAction(
ActionFilters actionFilters,
Writeable.Reader<Request> requestReader
) {
super(actionName, true, transportService, actionFilters, requestReader, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(actionName, transportService, actionFilters, requestReader, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.clusterService = clusterService;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ protected TransportBroadcastUnpromotableAction(
Writeable.Reader<Request> requestReader,
Executor executor
) {
super(actionName, true, transportService, actionFilters, requestReader, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(actionName, transportService, actionFilters, requestReader, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.clusterService = clusterService;
this.shardStateAction = shardStateAction;
this.transportService = transportService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public TransportBroadcastReplicationAction(
ActionType<ShardResponse> replicatedBroadcastShardAction,
Executor executor
) {
super(name, true, transportService, actionFilters, requestReader, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(name, transportService, actionFilters, requestReader, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.client = client;
this.replicatedBroadcastShardAction = replicatedBroadcastShardAction;
this.clusterService = clusterService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ protected TransportInstanceSingleOperationAction(
IndexNameExpressionResolver indexNameExpressionResolver,
Writeable.Reader<Request> request
) {
super(actionName, true, transportService, actionFilters, request, EsExecutors.DIRECT_EXECUTOR_SERVICE);
super(actionName, transportService, actionFilters, request, EsExecutors.DIRECT_EXECUTOR_SERVICE);
this.threadPool = threadPool;
this.clusterService = clusterService;
this.transportService = transportService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public class TransportDeleteSynonymRuleAction extends HandledTransportAction<Del
public TransportDeleteSynonymRuleAction(TransportService transportService, ActionFilters actionFilters, Client client) {
super(
DeleteSynonymRuleAction.NAME,
true,
transportService,
actionFilters,
DeleteSynonymRuleAction.Request::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public class TransportDeleteSynonymsAction extends HandledTransportAction<Delete
public TransportDeleteSynonymsAction(TransportService transportService, ActionFilters actionFilters, Client client) {
super(
DeleteSynonymsAction.NAME,
true,
transportService,
actionFilters,
DeleteSynonymsAction.Request::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public class TransportGetSynonymRuleAction extends HandledTransportAction<GetSyn
public TransportGetSynonymRuleAction(TransportService transportService, ActionFilters actionFilters, Client client) {
super(
GetSynonymRuleAction.NAME,
true,
transportService,
actionFilters,
GetSynonymRuleAction.Request::new,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,7 @@ public class TransportGetSynonymsAction extends HandledTransportAction<GetSynony

@Inject
public TransportGetSynonymsAction(TransportService transportService, ActionFilters actionFilters, Client client) {
super(
GetSynonymsAction.NAME,
true,
transportService,
actionFilters,
GetSynonymsAction.Request::new,
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
super(GetSynonymsAction.NAME, transportService, actionFilters, GetSynonymsAction.Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);

this.synonymsManagementAPIService = new SynonymsManagementAPIService(client);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public class TransportGetSynonymsSetsAction extends HandledTransportAction<GetSy
public TransportGetSynonymsSetsAction(TransportService transportService, ActionFilters actionFilters, Client client) {
super(
GetSynonymsSetsAction.NAME,
true,
transportService,
actionFilters,
GetSynonymsSetsAction.Request::new,
Expand Down
Loading

0 comments on commit 0f18e27

Please sign in to comment.