diff --git a/docs/changelog/122933.yaml b/docs/changelog/122933.yaml new file mode 100644 index 000000000000..4b9a58f017ba --- /dev/null +++ b/docs/changelog/122933.yaml @@ -0,0 +1,5 @@ +pr: 122933 +summary: Run XPack usage actions on local node +area: Stats +type: enhancement +issues: [] diff --git a/server/src/main/java/org/elasticsearch/action/support/local/TransportLocalClusterStateAction.java b/server/src/main/java/org/elasticsearch/action/support/local/TransportLocalClusterStateAction.java index 674679bd872d..a12dda5c9e43 100644 --- a/server/src/main/java/org/elasticsearch/action/support/local/TransportLocalClusterStateAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/local/TransportLocalClusterStateAction.java @@ -66,6 +66,9 @@ public abstract class TransportLocalClusterStateAction listener) { + if (task != null) { + request.setParentTask(clusterService.localNode().getId(), task.getId()); + } final var state = clusterService.state(); final var clusterBlockException = checkBlock(request, state); if (clusterBlockException != null) { diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsUsageTransportAction.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsUsageTransportAction.java index e47abf5d4061..23628659ad23 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsUsageTransportAction.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/action/AnalyticsUsageTransportAction.java @@ -38,7 +38,7 @@ public class AnalyticsUsageTransportAction extends XPackUsageFeatureTransportAct } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/AnalyticsInfoTransportActionTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/AnalyticsInfoTransportActionTests.java index 4cfffc80d248..46187c228705 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/AnalyticsInfoTransportActionTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/action/AnalyticsInfoTransportActionTests.java @@ -73,7 +73,7 @@ public class AnalyticsInfoTransportActionTests extends ESTestCase { client ); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(task, null, clusterState, future); + usageAction.localClusterStateOperation(task, null, clusterState, future); XPackFeatureUsage usage = future.get().getUsage(); assertThat(usage.available(), is(true)); @@ -100,7 +100,7 @@ public class AnalyticsInfoTransportActionTests extends ESTestCase { client ); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(task, null, clusterState, future); + usageAction.localClusterStateOperation(task, null, clusterState, future); XPackFeatureUsage usage = future.get().getUsage(); assertTrue(usage.enabled()); diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRUsageTransportAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRUsageTransportAction.java index bd10b71536e9..0abcf793042a 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRUsageTransportAction.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/CCRUsageTransportAction.java @@ -48,7 +48,7 @@ public class CCRUsageTransportAction extends XPackUsageFeatureTransportAction { } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CCRInfoTransportActionTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CCRInfoTransportActionTests.java index bc3654355da8..5ca3b4ca0199 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CCRInfoTransportActionTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CCRInfoTransportActionTests.java @@ -152,7 +152,7 @@ public class CCRInfoTransportActionTests extends ESTestCase { licenseState ); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, clusterState, future); + usageAction.localClusterStateOperation(null, null, clusterState, future); CCRInfoTransportAction.Usage ccrUsage = (CCRInfoTransportAction.Usage) future.get().getUsage(); assertThat(ccrUsage.enabled(), equalTo(true)); assertThat(ccrUsage.available(), equalTo(false)); diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/XPackUsageRestCancellationIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/XPackUsageRestCancellationIT.java index 511e16e7e822..dcc806c3d6d5 100644 --- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/XPackUsageRestCancellationIT.java +++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/XPackUsageRestCancellationIT.java @@ -150,7 +150,7 @@ public class XPackUsageRestCancellationIT extends ESIntegTestCase { } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, @@ -185,7 +185,7 @@ public class XPackUsageRestCancellationIT extends ESIntegTestCase { } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackUsageRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackUsageRequest.java index 1a308c83d0d5..9825db7a1218 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackUsageRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackUsageRequest.java @@ -7,7 +7,7 @@ package org.elasticsearch.protocol.xpack; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.support.master.MasterNodeRequest; +import org.elasticsearch.action.support.local.LocalClusterStateRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.core.TimeValue; import org.elasticsearch.tasks.CancellableTask; @@ -17,14 +17,14 @@ import org.elasticsearch.tasks.TaskId; import java.io.IOException; import java.util.Map; -public class XPackUsageRequest extends MasterNodeRequest { +public class XPackUsageRequest extends LocalClusterStateRequest { public XPackUsageRequest(TimeValue masterNodeTimeout) { super(masterNodeTimeout); } public XPackUsageRequest(StreamInput in) throws IOException { - super(in); + super(in, false); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/HealthApiUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/HealthApiUsageTransportAction.java index 4b43958e00e7..4449bd4e1ca1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/HealthApiUsageTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/HealthApiUsageTransportAction.java @@ -42,7 +42,7 @@ public class HealthApiUsageTransportAction extends XPackUsageFeatureTransportAct } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/RemoteClusterUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/RemoteClusterUsageTransportAction.java index d724a7bae9e9..970724a8d9ac 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/RemoteClusterUsageTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/RemoteClusterUsageTransportAction.java @@ -23,6 +23,8 @@ import org.elasticsearch.xpack.core.action.XPackUsageFeatureTransportAction; public class RemoteClusterUsageTransportAction extends XPackUsageFeatureTransportAction { + private TransportService transportService; + @Inject public RemoteClusterUsageTransportAction( TransportService transportService, @@ -31,10 +33,11 @@ public class RemoteClusterUsageTransportAction extends XPackUsageFeatureTranspor ActionFilters actionFilters ) { super(XPackUsageFeatureAction.REMOTE_CLUSTERS.name(), transportService, clusterService, threadPool, actionFilters); + this.transportService = transportService; } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportAction.java index da4259e25622..acf1f6545b01 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportAction.java @@ -47,7 +47,7 @@ public class DataStreamLifecycleUsageTransportAction extends XPackUsageFeatureTr } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamUsageTransportAction.java index 9006675ef6e8..5913e7e4620b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamUsageTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamUsageTransportAction.java @@ -39,7 +39,7 @@ public class DataStreamUsageTransportAction extends XPackUsageFeatureTransportAc } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportXPackUsageAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportXPackUsageAction.java index 30f50555bd54..96276fd03923 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportXPackUsageAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportXPackUsageAction.java @@ -10,11 +10,13 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRunnable; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeAction; +import org.elasticsearch.action.support.ChannelActionListener; +import org.elasticsearch.action.support.local.TransportLocalClusterStateAction; import org.elasticsearch.client.internal.node.NodeClient; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.service.ClusterService; +import org.elasticsearch.core.UpdateForV10; import org.elasticsearch.injection.guice.Inject; import org.elasticsearch.protocol.xpack.XPackUsageRequest; import org.elasticsearch.tasks.Task; @@ -25,11 +27,16 @@ import org.elasticsearch.xpack.core.XPackFeatureUsage; import java.util.ArrayList; import java.util.List; -public class TransportXPackUsageAction extends TransportMasterNodeAction { +public class TransportXPackUsageAction extends TransportLocalClusterStateAction { private final NodeClient client; private final List> usageActions; + /** + * NB prior to 9.0 this was a TransportMasterNodeReadAction so for BwC it must be registered with the TransportService until + * we no longer need to support calling this action remotely. + */ + @UpdateForV10(owner = UpdateForV10.Owner.DATA_MANAGEMENT) @SuppressWarnings("this-escape") @Inject public TransportXPackUsageAction( @@ -41,16 +48,22 @@ public class TransportXPackUsageAction extends TransportMasterNodeAction executeDirect(task, request, new ChannelActionListener<>(channel)) + ); } // overrideable for tests @@ -59,14 +72,19 @@ public class TransportXPackUsageAction extends TransportMasterNodeAction listener) { + protected void localClusterStateOperation( + Task task, + XPackUsageRequest request, + ClusterState state, + ActionListener listener + ) { new ActionRunnable<>(listener) { final List responses = new ArrayList<>(usageActions.size()); @Override protected void doRun() { if (responses.size() < usageActions().size()) { - final var childRequest = new XPackUsageRequest(request.masterNodeTimeout()); + final var childRequest = new XPackUsageRequest(request.masterTimeout()); childRequest.setParentTask(request.getParentTask()); client.executeLocally( usageActions.get(responses.size()), diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackUsageFeatureTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackUsageFeatureTransportAction.java index 42463ac71e93..708cb8079501 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackUsageFeatureTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackUsageFeatureTransportAction.java @@ -7,16 +7,26 @@ package org.elasticsearch.xpack.core.action; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeAction; +import org.elasticsearch.action.support.ChannelActionListener; +import org.elasticsearch.action.support.local.TransportLocalClusterStateAction; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.service.ClusterService; +import org.elasticsearch.core.UpdateForV10; import org.elasticsearch.protocol.xpack.XPackUsageRequest; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -public abstract class XPackUsageFeatureTransportAction extends TransportMasterNodeAction { +public abstract class XPackUsageFeatureTransportAction extends TransportLocalClusterStateAction< + XPackUsageRequest, + XPackUsageFeatureResponse> { + /** + * NB prior to 9.0 this was a TransportMasterNodeReadAction so for BwC it must be registered with the TransportService until + * we no longer need to support calling this action remotely. + */ + @UpdateForV10(owner = UpdateForV10.Owner.DATA_MANAGEMENT) + @SuppressWarnings("this-escape") public XPackUsageFeatureTransportAction( String name, TransportService transportService, @@ -24,15 +34,15 @@ public abstract class XPackUsageFeatureTransportAction extends TransportMasterNo ThreadPool threadPool, ActionFilters actionFilters ) { - super( - name, - transportService, - clusterService, - threadPool, - actionFilters, + super(name, actionFilters, transportService.getTaskManager(), clusterService, threadPool.executor(ThreadPool.Names.MANAGEMENT)); + + transportService.registerRequestHandler( + actionName, + executor, + false, + true, XPackUsageRequest::new, - XPackUsageFeatureResponse::new, - threadPool.executor(ThreadPool.Names.MANAGEMENT) + (request, channel, task) -> executeDirect(task, request, new ChannelActionListener<>(channel)) ); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportAction.java index 3688a4cd9cba..11a468e5f3ea 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportAction.java @@ -57,7 +57,7 @@ public class DataTiersUsageTransportAction extends XPackUsageFeatureTransportAct } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichUsageTransportAction.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichUsageTransportAction.java index 64a356ab57e5..6c00afcf9b65 100644 --- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichUsageTransportAction.java +++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichUsageTransportAction.java @@ -33,7 +33,7 @@ public class EnrichUsageTransportAction extends XPackUsageFeatureTransportAction } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearchUsageTransportAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearchUsageTransportAction.java index 9ba4ca092c26..f5dadd02adf3 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearchUsageTransportAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearchUsageTransportAction.java @@ -78,7 +78,7 @@ public class EnterpriseSearchUsageTransportAction extends XPackUsageFeatureTrans } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, @@ -153,7 +153,7 @@ public class EnterpriseSearchUsageTransportAction extends XPackUsageFeatureTrans // Step 1: Fetch analytics collections count GetAnalyticsCollectionAction.Request analyticsCollectionsCountRequest = new GetAnalyticsCollectionAction.Request( - request.masterNodeTimeout(), + request.masterTimeout(), new String[] { "*" } ); diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/EqlUsageTransportAction.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/EqlUsageTransportAction.java index d62684a0c58f..866ba0670521 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/EqlUsageTransportAction.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/EqlUsageTransportAction.java @@ -46,7 +46,7 @@ public class EqlUsageTransportAction extends XPackUsageFeatureTransportAction { } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/EqlInfoTransportActionTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/EqlInfoTransportActionTests.java index 38b1f8f87bd1..9d8e1cbd98e2 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/EqlInfoTransportActionTests.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/EqlInfoTransportActionTests.java @@ -100,7 +100,7 @@ public class EqlInfoTransportActionTests extends ESTestCase { TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool); var usageAction = new EqlUsageTransportAction(transportService, clusterService, threadPool, mock(ActionFilters.class), client); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(mock(Task.class), null, null, future); + usageAction.localClusterStateOperation(mock(Task.class), null, null, future); EqlFeatureSetUsage eqlUsage = (EqlFeatureSetUsage) future.get().getUsage(); long fooBarBaz = ObjectPath.eval("foo.bar.baz", eqlUsage.stats()); diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/EsqlUsageTransportAction.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/EsqlUsageTransportAction.java index 164fcb7ab427..edec69263481 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/EsqlUsageTransportAction.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/EsqlUsageTransportAction.java @@ -46,7 +46,7 @@ public class EsqlUsageTransportAction extends XPackUsageFeatureTransportAction { } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/EsqlInfoTransportActionTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/EsqlInfoTransportActionTests.java index 3521e173cdee..7c3ae3fc4aee 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/EsqlInfoTransportActionTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/EsqlInfoTransportActionTests.java @@ -102,7 +102,7 @@ public class EsqlInfoTransportActionTests extends ESTestCase { var usageAction = new EsqlUsageTransportAction(transportService, clusterService, threadPool, mock(ActionFilters.class), client); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(mock(Task.class), null, null, future); + usageAction.localClusterStateOperation(mock(Task.class), null, null, future); EsqlFeatureSetUsage esqlUsage = (EsqlFeatureSetUsage) future.get().getUsage(); long fooBarBaz = ObjectPath.eval("foo.bar.baz", esqlUsage.stats()); diff --git a/x-pack/plugin/frozen-indices/src/main/java/org/elasticsearch/xpack/frozen/FrozenIndicesUsageTransportAction.java b/x-pack/plugin/frozen-indices/src/main/java/org/elasticsearch/xpack/frozen/FrozenIndicesUsageTransportAction.java index 8bc3d94c8286..add9882f250f 100644 --- a/x-pack/plugin/frozen-indices/src/main/java/org/elasticsearch/xpack/frozen/FrozenIndicesUsageTransportAction.java +++ b/x-pack/plugin/frozen-indices/src/main/java/org/elasticsearch/xpack/frozen/FrozenIndicesUsageTransportAction.java @@ -35,7 +35,7 @@ public class FrozenIndicesUsageTransportAction extends XPackUsageFeatureTranspor } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/GraphUsageTransportAction.java b/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/GraphUsageTransportAction.java index 89799b399d7a..e364fcfbc9c2 100644 --- a/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/GraphUsageTransportAction.java +++ b/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/GraphUsageTransportAction.java @@ -43,7 +43,7 @@ public class GraphUsageTransportAction extends XPackUsageFeatureTransportAction } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/graph/src/test/java/org/elasticsearch/xpack/graph/GraphInfoTransportActionTests.java b/x-pack/plugin/graph/src/test/java/org/elasticsearch/xpack/graph/GraphInfoTransportActionTests.java index 8624969a9710..5794252cef6d 100644 --- a/x-pack/plugin/graph/src/test/java/org/elasticsearch/xpack/graph/GraphInfoTransportActionTests.java +++ b/x-pack/plugin/graph/src/test/java/org/elasticsearch/xpack/graph/GraphInfoTransportActionTests.java @@ -54,7 +54,7 @@ public class GraphInfoTransportActionTests extends ESTestCase { licenseState ); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, null, future); + usageAction.localClusterStateOperation(null, null, null, future); XPackFeatureUsage usage = future.get().getUsage(); assertThat(usage.available(), is(available)); @@ -93,7 +93,7 @@ public class GraphInfoTransportActionTests extends ESTestCase { licenseState ); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, null, future); + usageAction.localClusterStateOperation(null, null, null, future); XPackFeatureUsage usage = future.get().getUsage(); assertThat(usage.enabled(), is(enabled)); diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleUsageTransportAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleUsageTransportAction.java index 2e04d37be151..2caff49b603c 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleUsageTransportAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/IndexLifecycleUsageTransportAction.java @@ -53,7 +53,7 @@ public class IndexLifecycleUsageTransportAction extends XPackUsageFeatureTranspo } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInfoTransportActionTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInfoTransportActionTests.java index 0a2621a89387..f4f5b794a98c 100644 --- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInfoTransportActionTests.java +++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleInfoTransportActionTests.java @@ -94,7 +94,7 @@ public class IndexLifecycleInfoTransportActionTests extends ESTestCase { TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool); var usageAction = new IndexLifecycleUsageTransportAction(transportService, null, threadPool, mock(ActionFilters.class)); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, clusterState, future); + usageAction.localClusterStateOperation(null, null, clusterState, future); IndexLifecycleFeatureSetUsage ilmUsage = (IndexLifecycleFeatureSetUsage) future.get().getUsage(); assertThat(ilmUsage.enabled(), equalTo(true)); assertThat(ilmUsage.available(), equalTo(true)); diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageAction.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageAction.java index 6804257d1cf4..419d2d3b060a 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageAction.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageAction.java @@ -48,7 +48,7 @@ public class TransportInferenceUsageAction extends XPackUsageFeatureTransportAct } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageActionTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageActionTests.java index 430e1c0048da..8ffd421959f4 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageActionTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageActionTests.java @@ -92,7 +92,7 @@ public class TransportInferenceUsageActionTests extends ESTestCase { }).when(client).execute(any(GetInferenceModelAction.class), any(), any()); PlainActionFuture future = new PlainActionFuture<>(); - action.masterOperation(mock(Task.class), mock(XPackUsageRequest.class), mock(ClusterState.class), future); + action.localClusterStateOperation(mock(Task.class), mock(XPackUsageRequest.class), mock(ClusterState.class), future); BytesStreamOutput out = new BytesStreamOutput(); future.get().getUsage().writeTo(out); diff --git a/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsDBUsageTransportAction.java b/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsDBUsageTransportAction.java index 298a885508b6..abcaf5c39cbb 100644 --- a/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsDBUsageTransportAction.java +++ b/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsDBUsageTransportAction.java @@ -45,7 +45,7 @@ public class LogsDBUsageTransportAction extends XPackUsageFeatureTransportAction } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/LogstashUsageTransportAction.java b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/LogstashUsageTransportAction.java index d0587dffe13b..c253b0396c6b 100644 --- a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/LogstashUsageTransportAction.java +++ b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/LogstashUsageTransportAction.java @@ -38,7 +38,7 @@ public class LogstashUsageTransportAction extends XPackUsageFeatureTransportActi } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/logstash/src/test/java/org/elasticsearch/xpack/logstash/LogstashInfoTransportActionTests.java b/x-pack/plugin/logstash/src/test/java/org/elasticsearch/xpack/logstash/LogstashInfoTransportActionTests.java index 93eb5b6a6d8a..6e3ac59c9135 100644 --- a/x-pack/plugin/logstash/src/test/java/org/elasticsearch/xpack/logstash/LogstashInfoTransportActionTests.java +++ b/x-pack/plugin/logstash/src/test/java/org/elasticsearch/xpack/logstash/LogstashInfoTransportActionTests.java @@ -35,7 +35,7 @@ public class LogstashInfoTransportActionTests extends ESTestCase { LogstashUsageTransportAction usageAction = newUsageAction(false); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, null, future); + usageAction.localClusterStateOperation(null, null, null, future); XPackFeatureUsage usage = future.get().getUsage(); BytesStreamOutput out = new BytesStreamOutput(); @@ -53,7 +53,7 @@ public class LogstashInfoTransportActionTests extends ESTestCase { var usageAction = newUsageAction(available); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, null, future); + usageAction.localClusterStateOperation(null, null, null, future); XPackFeatureUsage usage = future.get().getUsage(); assertThat(usage.available(), is(available)); diff --git a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/AggregateMetricUsageTransportAction.java b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/AggregateMetricUsageTransportAction.java index 5b16ae6f41b2..d2448fba4757 100644 --- a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/AggregateMetricUsageTransportAction.java +++ b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/AggregateMetricUsageTransportAction.java @@ -34,7 +34,7 @@ public class AggregateMetricUsageTransportAction extends XPackUsageFeatureTransp } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningUsageTransportAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningUsageTransportAction.java index a088a50cac40..bed0cbe3b867 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningUsageTransportAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningUsageTransportAction.java @@ -143,7 +143,7 @@ public class MachineLearningUsageTransportAction extends XPackUsageFeatureTransp } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningInfoTransportActionTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningInfoTransportActionTests.java index 3c6563a99402..4a3b29904216 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningInfoTransportActionTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningInfoTransportActionTests.java @@ -200,7 +200,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase { assertThat(featureSet.available(), is(available)); var usageAction = newUsageAction(commonSettings, randomBoolean(), randomBoolean(), randomBoolean()); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future); + usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future); XPackFeatureUsage usage = future.get().getUsage(); assertThat(usage.available(), is(available)); @@ -230,7 +230,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase { assertThat(featureSet.enabled(), is(expected)); var usageAction = newUsageAction(settings.build(), randomBoolean(), randomBoolean(), randomBoolean()); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future); + usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future); XPackFeatureUsage usage = future.get().getUsage(); assertThat(usage.enabled(), is(expected)); @@ -251,7 +251,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase { var usageAction = newUsageAction(settings.build(), true, true, true); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future); + usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future); XPackFeatureUsage mlUsage = future.get().getUsage(); BytesStreamOutput out = new BytesStreamOutput(); @@ -409,7 +409,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase { var usageAction = newUsageAction(settings.build(), false, true, true); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future); + usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future); XPackFeatureUsage mlUsage = future.get().getUsage(); BytesStreamOutput out = new BytesStreamOutput(); @@ -505,7 +505,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase { var usageAction = newUsageAction(settings.build(), true, false, false); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future); + usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future); XPackFeatureUsage mlUsage = future.get().getUsage(); BytesStreamOutput out = new BytesStreamOutput(); @@ -602,7 +602,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase { var usageAction = newUsageAction(settings.build(), true, true, true); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future); + usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future); XPackFeatureUsage usage = future.get().getUsage(); XContentSource source; @@ -637,7 +637,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase { var usageAction = newUsageAction(settings.build(), randomBoolean(), randomBoolean(), randomBoolean()); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future); + usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future); XPackFeatureUsage mlUsage = future.get().getUsage(); BytesStreamOutput out = new BytesStreamOutput(); mlUsage.writeTo(out); @@ -659,7 +659,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase { var usageAction = newUsageAction(settings.build(), randomBoolean(), randomBoolean(), randomBoolean()); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, clusterState, future); + usageAction.localClusterStateOperation(null, null, clusterState, future); XPackFeatureUsage usage = future.get().getUsage(); assertThat(usage.available(), is(true)); @@ -685,7 +685,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase { var usageAction = newUsageAction(settings.build(), true, true, true); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future); + usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future); XPackFeatureUsage usage = future.get().getUsage(); assertThat(usage.available(), is(true)); diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringUsageTransportAction.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringUsageTransportAction.java index 0e3cedf37cab..fc016087e0a7 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringUsageTransportAction.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringUsageTransportAction.java @@ -43,7 +43,7 @@ public class MonitoringUsageTransportAction extends XPackUsageFeatureTransportAc } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringInfoTransportActionTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringInfoTransportActionTests.java index 575ba45deea3..9fc62d1ecf6f 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringInfoTransportActionTests.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringInfoTransportActionTests.java @@ -101,7 +101,7 @@ public class MonitoringInfoTransportActionTests extends ESTestCase { new MonitoringUsageServices(monitoring, exporters) ); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, null, future); + usageAction.localClusterStateOperation(null, null, null, future); MonitoringFeatureSetUsage monitoringUsage = (MonitoringFeatureSetUsage) future.get().getUsage(); BytesStreamOutput out = new BytesStreamOutput(); out.setTransportVersion(serializedVersion); diff --git a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/ArchiveUsageTransportAction.java b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/ArchiveUsageTransportAction.java index 23a823acbe15..09b4666f31ae 100644 --- a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/ArchiveUsageTransportAction.java +++ b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/ArchiveUsageTransportAction.java @@ -42,7 +42,7 @@ public class ArchiveUsageTransportAction extends XPackUsageFeatureTransportActio } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/ProfilingUsageTransportAction.java b/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/ProfilingUsageTransportAction.java index 49dd05d25591..543977c23b46 100644 --- a/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/ProfilingUsageTransportAction.java +++ b/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/ProfilingUsageTransportAction.java @@ -43,7 +43,7 @@ public class ProfilingUsageTransportAction extends XPackUsageFeatureTransportAct } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/RollupUsageTransportAction.java b/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/RollupUsageTransportAction.java index c680b037463f..9009af3eea9a 100644 --- a/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/RollupUsageTransportAction.java +++ b/x-pack/plugin/rollup/src/main/java/org/elasticsearch/xpack/rollup/action/RollupUsageTransportAction.java @@ -36,7 +36,7 @@ public class RollupUsageTransportAction extends XPackUsageFeatureTransportAction } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/action/RollupInfoTransportActionTests.java b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/action/RollupInfoTransportActionTests.java index 1dabf9394ea6..a5e30cd3a8cb 100644 --- a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/action/RollupInfoTransportActionTests.java +++ b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/action/RollupInfoTransportActionTests.java @@ -43,7 +43,7 @@ public class RollupInfoTransportActionTests extends ESTestCase { TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool); var usageAction = new RollupUsageTransportAction(transportService, null, threadPool, mock(ActionFilters.class)); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future); + usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future); RollupFeatureSetUsage rollupUsage = (RollupFeatureSetUsage) future.get().getUsage(); BytesStreamOutput out = new BytesStreamOutput(); rollupUsage.writeTo(out); diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/SearchableSnapshotsUsageTransportAction.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/SearchableSnapshotsUsageTransportAction.java index dd543db8dd52..f6aff0d549aa 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/SearchableSnapshotsUsageTransportAction.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/SearchableSnapshotsUsageTransportAction.java @@ -42,7 +42,7 @@ public class SearchableSnapshotsUsageTransportAction extends XPackUsageFeatureTr } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/SecurityUsageTransportAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/SecurityUsageTransportAction.java index 45b019ad18f7..15b758ceb49e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/SecurityUsageTransportAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/SecurityUsageTransportAction.java @@ -84,7 +84,7 @@ public class SecurityUsageTransportAction extends XPackUsageFeatureTransportActi } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityInfoTransportActionTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityInfoTransportActionTests.java index e0a971aef746..eb4cd6d3c188 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityInfoTransportActionTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityInfoTransportActionTests.java @@ -212,7 +212,7 @@ public class SecurityInfoTransportActionTests extends ESTestCase { var usageAction = newUsageAction(settings.build()); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(null, null, null, future); + usageAction.localClusterStateOperation(null, null, null, future); SecurityFeatureSetUsage securityUsage = (SecurityFeatureSetUsage) future.get().getUsage(); BytesStreamOutput out = new BytesStreamOutput(); securityUsage.writeTo(out); diff --git a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMUsageTransportAction.java b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMUsageTransportAction.java index c7d21aad53c1..f0077776a03e 100644 --- a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMUsageTransportAction.java +++ b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SLMUsageTransportAction.java @@ -35,7 +35,7 @@ public class SLMUsageTransportAction extends XPackUsageFeatureTransportAction { } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/action/SpatialUsageTransportAction.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/action/SpatialUsageTransportAction.java index c82b0f5a70d4..73052ef68bb5 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/action/SpatialUsageTransportAction.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/action/SpatialUsageTransportAction.java @@ -39,7 +39,7 @@ public class SpatialUsageTransportAction extends XPackUsageFeatureTransportActio } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/action/SpatialInfoTransportActionTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/action/SpatialInfoTransportActionTests.java index c38db3b9c2fa..356245f7029d 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/action/SpatialInfoTransportActionTests.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/action/SpatialInfoTransportActionTests.java @@ -71,7 +71,7 @@ public class SpatialInfoTransportActionTests extends ESTestCase { ); PlainActionFuture future = new PlainActionFuture<>(); Task task = new Task(1L, "_type", "_action", "_description", null, Collections.emptyMap()); - usageAction.masterOperation(task, null, clusterService.state(), future); + usageAction.localClusterStateOperation(task, null, clusterService.state(), future); XPackFeatureUsage usage = future.get().getUsage(); assertThat(usage.available(), is(true)); @@ -96,7 +96,7 @@ public class SpatialInfoTransportActionTests extends ESTestCase { mockClient() ); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(mock(Task.class), null, clusterService.state(), future); + usageAction.localClusterStateOperation(mock(Task.class), null, clusterService.state(), future); XPackFeatureUsage usage = future.get().getUsage(); assertTrue(usage.enabled()); diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/SqlUsageTransportAction.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/SqlUsageTransportAction.java index 4191d326ed32..76b4438acd11 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/SqlUsageTransportAction.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/SqlUsageTransportAction.java @@ -45,7 +45,7 @@ public class SqlUsageTransportAction extends XPackUsageFeatureTransportAction { } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/SqlInfoTransportActionTests.java b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/SqlInfoTransportActionTests.java index e8100a6e3c4b..a88658083f08 100644 --- a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/SqlInfoTransportActionTests.java +++ b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/SqlInfoTransportActionTests.java @@ -97,7 +97,7 @@ public class SqlInfoTransportActionTests extends ESTestCase { TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool); var usageAction = new SqlUsageTransportAction(transportService, clusterService, threadPool, mock(ActionFilters.class), client); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(mock(Task.class), null, null, future); + usageAction.localClusterStateOperation(mock(Task.class), null, null, future); SqlFeatureSetUsage sqlUsage = (SqlFeatureSetUsage) future.get().getUsage(); long fooBarBaz = ObjectPath.eval("foo.bar.baz", sqlUsage.stats()); diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/TransformUsageTransportAction.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/TransformUsageTransportAction.java index d8b1056078ba..aeacb4b69547 100644 --- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/TransformUsageTransportAction.java +++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/TransformUsageTransportAction.java @@ -84,7 +84,7 @@ public class TransformUsageTransportAction extends XPackUsageFeatureTransportAct } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState clusterState, diff --git a/x-pack/plugin/voting-only-node/src/main/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyUsageTransportAction.java b/x-pack/plugin/voting-only-node/src/main/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyUsageTransportAction.java index b9873b31881f..cdd19ac5de25 100644 --- a/x-pack/plugin/voting-only-node/src/main/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyUsageTransportAction.java +++ b/x-pack/plugin/voting-only-node/src/main/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyUsageTransportAction.java @@ -34,7 +34,7 @@ public class VotingOnlyUsageTransportAction extends XPackUsageFeatureTransportAc } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherUsageTransportAction.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherUsageTransportAction.java index 8bf4ae276034..61abe870aba8 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherUsageTransportAction.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherUsageTransportAction.java @@ -59,7 +59,7 @@ public class WatcherUsageTransportAction extends XPackUsageFeatureTransportActio } @Override - protected void masterOperation( + protected void localClusterStateOperation( Task task, XPackUsageRequest request, ClusterState state, diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherInfoTransportActionTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherInfoTransportActionTests.java index 2fd38a7b81cd..f97dcc1c0b75 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherInfoTransportActionTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherInfoTransportActionTests.java @@ -143,7 +143,7 @@ public class WatcherInfoTransportActionTests extends ESTestCase { client ); PlainActionFuture future = new PlainActionFuture<>(); - usageAction.masterOperation(mock(Task.class), null, null, future); + usageAction.localClusterStateOperation(mock(Task.class), null, null, future); WatcherFeatureSetUsage watcherUsage = (WatcherFeatureSetUsage) future.get().getUsage(); assertThat(watcherUsage.stats().keySet(), containsInAnyOrder("foo", "spam")); long fooBarBaz = ObjectPath.eval("foo.bar.baz", watcherUsage.stats());