mirror of
https://github.com/elastic/elasticsearch.git
synced 2025-04-25 07:37:19 -04:00
Run XPack usage actions on local node (#122933)
These actions solely need the cluster state, they can run on any node. Relates #101805
This commit is contained in:
parent
2fcb23a87e
commit
afff39ed5c
52 changed files with 122 additions and 83 deletions
5
docs/changelog/122933.yaml
Normal file
5
docs/changelog/122933.yaml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
pr: 122933
|
||||||
|
summary: Run XPack usage actions on local node
|
||||||
|
area: Stats
|
||||||
|
type: enhancement
|
||||||
|
issues: []
|
|
@ -66,6 +66,9 @@ public abstract class TransportLocalClusterStateAction<Request extends LocalClus
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void doExecute(Task task, Request request, ActionListener<Response> listener) {
|
protected final void doExecute(Task task, Request request, ActionListener<Response> listener) {
|
||||||
|
if (task != null) {
|
||||||
|
request.setParentTask(clusterService.localNode().getId(), task.getId());
|
||||||
|
}
|
||||||
final var state = clusterService.state();
|
final var state = clusterService.state();
|
||||||
final var clusterBlockException = checkBlock(request, state);
|
final var clusterBlockException = checkBlock(request, state);
|
||||||
if (clusterBlockException != null) {
|
if (clusterBlockException != null) {
|
||||||
|
|
|
@ -38,7 +38,7 @@ public class AnalyticsUsageTransportAction extends XPackUsageFeatureTransportAct
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -73,7 +73,7 @@ public class AnalyticsInfoTransportActionTests extends ESTestCase {
|
||||||
client
|
client
|
||||||
);
|
);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(task, null, clusterState, future);
|
usageAction.localClusterStateOperation(task, null, clusterState, future);
|
||||||
XPackFeatureUsage usage = future.get().getUsage();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
assertThat(usage.available(), is(true));
|
assertThat(usage.available(), is(true));
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ public class AnalyticsInfoTransportActionTests extends ESTestCase {
|
||||||
client
|
client
|
||||||
);
|
);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(task, null, clusterState, future);
|
usageAction.localClusterStateOperation(task, null, clusterState, future);
|
||||||
XPackFeatureUsage usage = future.get().getUsage();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
assertTrue(usage.enabled());
|
assertTrue(usage.enabled());
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ public class CCRUsageTransportAction extends XPackUsageFeatureTransportAction {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -152,7 +152,7 @@ public class CCRInfoTransportActionTests extends ESTestCase {
|
||||||
licenseState
|
licenseState
|
||||||
);
|
);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, clusterState, future);
|
usageAction.localClusterStateOperation(null, null, clusterState, future);
|
||||||
CCRInfoTransportAction.Usage ccrUsage = (CCRInfoTransportAction.Usage) future.get().getUsage();
|
CCRInfoTransportAction.Usage ccrUsage = (CCRInfoTransportAction.Usage) future.get().getUsage();
|
||||||
assertThat(ccrUsage.enabled(), equalTo(true));
|
assertThat(ccrUsage.enabled(), equalTo(true));
|
||||||
assertThat(ccrUsage.available(), equalTo(false));
|
assertThat(ccrUsage.available(), equalTo(false));
|
||||||
|
|
|
@ -150,7 +150,7 @@ public class XPackUsageRestCancellationIT extends ESIntegTestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
@ -185,7 +185,7 @@ public class XPackUsageRestCancellationIT extends ESIntegTestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
package org.elasticsearch.protocol.xpack;
|
package org.elasticsearch.protocol.xpack;
|
||||||
|
|
||||||
import org.elasticsearch.action.ActionRequestValidationException;
|
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.common.io.stream.StreamInput;
|
||||||
import org.elasticsearch.core.TimeValue;
|
import org.elasticsearch.core.TimeValue;
|
||||||
import org.elasticsearch.tasks.CancellableTask;
|
import org.elasticsearch.tasks.CancellableTask;
|
||||||
|
@ -17,14 +17,14 @@ import org.elasticsearch.tasks.TaskId;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public class XPackUsageRequest extends MasterNodeRequest<XPackUsageRequest> {
|
public class XPackUsageRequest extends LocalClusterStateRequest {
|
||||||
|
|
||||||
public XPackUsageRequest(TimeValue masterNodeTimeout) {
|
public XPackUsageRequest(TimeValue masterNodeTimeout) {
|
||||||
super(masterNodeTimeout);
|
super(masterNodeTimeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
public XPackUsageRequest(StreamInput in) throws IOException {
|
public XPackUsageRequest(StreamInput in) throws IOException {
|
||||||
super(in);
|
super(in, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -42,7 +42,7 @@ public class HealthApiUsageTransportAction extends XPackUsageFeatureTransportAct
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -23,6 +23,8 @@ import org.elasticsearch.xpack.core.action.XPackUsageFeatureTransportAction;
|
||||||
|
|
||||||
public class RemoteClusterUsageTransportAction extends XPackUsageFeatureTransportAction {
|
public class RemoteClusterUsageTransportAction extends XPackUsageFeatureTransportAction {
|
||||||
|
|
||||||
|
private TransportService transportService;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public RemoteClusterUsageTransportAction(
|
public RemoteClusterUsageTransportAction(
|
||||||
TransportService transportService,
|
TransportService transportService,
|
||||||
|
@ -31,10 +33,11 @@ public class RemoteClusterUsageTransportAction extends XPackUsageFeatureTranspor
|
||||||
ActionFilters actionFilters
|
ActionFilters actionFilters
|
||||||
) {
|
) {
|
||||||
super(XPackUsageFeatureAction.REMOTE_CLUSTERS.name(), transportService, clusterService, threadPool, actionFilters);
|
super(XPackUsageFeatureAction.REMOTE_CLUSTERS.name(), transportService, clusterService, threadPool, actionFilters);
|
||||||
|
this.transportService = transportService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -47,7 +47,7 @@ public class DataStreamLifecycleUsageTransportAction extends XPackUsageFeatureTr
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class DataStreamUsageTransportAction extends XPackUsageFeatureTransportAc
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -10,11 +10,13 @@ import org.elasticsearch.action.ActionListener;
|
||||||
import org.elasticsearch.action.ActionRunnable;
|
import org.elasticsearch.action.ActionRunnable;
|
||||||
import org.elasticsearch.action.ActionType;
|
import org.elasticsearch.action.ActionType;
|
||||||
import org.elasticsearch.action.support.ActionFilters;
|
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.client.internal.node.NodeClient;
|
||||||
import org.elasticsearch.cluster.ClusterState;
|
import org.elasticsearch.cluster.ClusterState;
|
||||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||||
import org.elasticsearch.cluster.service.ClusterService;
|
import org.elasticsearch.cluster.service.ClusterService;
|
||||||
|
import org.elasticsearch.core.UpdateForV10;
|
||||||
import org.elasticsearch.injection.guice.Inject;
|
import org.elasticsearch.injection.guice.Inject;
|
||||||
import org.elasticsearch.protocol.xpack.XPackUsageRequest;
|
import org.elasticsearch.protocol.xpack.XPackUsageRequest;
|
||||||
import org.elasticsearch.tasks.Task;
|
import org.elasticsearch.tasks.Task;
|
||||||
|
@ -25,11 +27,16 @@ import org.elasticsearch.xpack.core.XPackFeatureUsage;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class TransportXPackUsageAction extends TransportMasterNodeAction<XPackUsageRequest, XPackUsageResponse> {
|
public class TransportXPackUsageAction extends TransportLocalClusterStateAction<XPackUsageRequest, XPackUsageResponse> {
|
||||||
|
|
||||||
private final NodeClient client;
|
private final NodeClient client;
|
||||||
private final List<ActionType<XPackUsageFeatureResponse>> usageActions;
|
private final List<ActionType<XPackUsageFeatureResponse>> 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")
|
@SuppressWarnings("this-escape")
|
||||||
@Inject
|
@Inject
|
||||||
public TransportXPackUsageAction(
|
public TransportXPackUsageAction(
|
||||||
|
@ -41,16 +48,22 @@ public class TransportXPackUsageAction extends TransportMasterNodeAction<XPackUs
|
||||||
) {
|
) {
|
||||||
super(
|
super(
|
||||||
XPackUsageAction.NAME,
|
XPackUsageAction.NAME,
|
||||||
transportService,
|
|
||||||
clusterService,
|
|
||||||
threadPool,
|
|
||||||
actionFilters,
|
actionFilters,
|
||||||
XPackUsageRequest::new,
|
transportService.getTaskManager(),
|
||||||
XPackUsageResponse::new,
|
clusterService,
|
||||||
threadPool.executor(ThreadPool.Names.MANAGEMENT)
|
threadPool.executor(ThreadPool.Names.MANAGEMENT)
|
||||||
);
|
);
|
||||||
this.client = client;
|
this.client = client;
|
||||||
this.usageActions = usageActions();
|
this.usageActions = usageActions();
|
||||||
|
|
||||||
|
transportService.registerRequestHandler(
|
||||||
|
actionName,
|
||||||
|
executor,
|
||||||
|
false,
|
||||||
|
true,
|
||||||
|
XPackUsageRequest::new,
|
||||||
|
(request, channel, task) -> executeDirect(task, request, new ChannelActionListener<>(channel))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// overrideable for tests
|
// overrideable for tests
|
||||||
|
@ -59,14 +72,19 @@ public class TransportXPackUsageAction extends TransportMasterNodeAction<XPackUs
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(Task task, XPackUsageRequest request, ClusterState state, ActionListener<XPackUsageResponse> listener) {
|
protected void localClusterStateOperation(
|
||||||
|
Task task,
|
||||||
|
XPackUsageRequest request,
|
||||||
|
ClusterState state,
|
||||||
|
ActionListener<XPackUsageResponse> listener
|
||||||
|
) {
|
||||||
new ActionRunnable<>(listener) {
|
new ActionRunnable<>(listener) {
|
||||||
final List<XPackFeatureUsage> responses = new ArrayList<>(usageActions.size());
|
final List<XPackFeatureUsage> responses = new ArrayList<>(usageActions.size());
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void doRun() {
|
protected void doRun() {
|
||||||
if (responses.size() < usageActions().size()) {
|
if (responses.size() < usageActions().size()) {
|
||||||
final var childRequest = new XPackUsageRequest(request.masterNodeTimeout());
|
final var childRequest = new XPackUsageRequest(request.masterTimeout());
|
||||||
childRequest.setParentTask(request.getParentTask());
|
childRequest.setParentTask(request.getParentTask());
|
||||||
client.executeLocally(
|
client.executeLocally(
|
||||||
usageActions.get(responses.size()),
|
usageActions.get(responses.size()),
|
||||||
|
|
|
@ -7,16 +7,26 @@
|
||||||
package org.elasticsearch.xpack.core.action;
|
package org.elasticsearch.xpack.core.action;
|
||||||
|
|
||||||
import org.elasticsearch.action.support.ActionFilters;
|
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.ClusterState;
|
||||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||||
import org.elasticsearch.cluster.service.ClusterService;
|
import org.elasticsearch.cluster.service.ClusterService;
|
||||||
|
import org.elasticsearch.core.UpdateForV10;
|
||||||
import org.elasticsearch.protocol.xpack.XPackUsageRequest;
|
import org.elasticsearch.protocol.xpack.XPackUsageRequest;
|
||||||
import org.elasticsearch.threadpool.ThreadPool;
|
import org.elasticsearch.threadpool.ThreadPool;
|
||||||
import org.elasticsearch.transport.TransportService;
|
import org.elasticsearch.transport.TransportService;
|
||||||
|
|
||||||
public abstract class XPackUsageFeatureTransportAction extends TransportMasterNodeAction<XPackUsageRequest, XPackUsageFeatureResponse> {
|
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(
|
public XPackUsageFeatureTransportAction(
|
||||||
String name,
|
String name,
|
||||||
TransportService transportService,
|
TransportService transportService,
|
||||||
|
@ -24,15 +34,15 @@ public abstract class XPackUsageFeatureTransportAction extends TransportMasterNo
|
||||||
ThreadPool threadPool,
|
ThreadPool threadPool,
|
||||||
ActionFilters actionFilters
|
ActionFilters actionFilters
|
||||||
) {
|
) {
|
||||||
super(
|
super(name, actionFilters, transportService.getTaskManager(), clusterService, threadPool.executor(ThreadPool.Names.MANAGEMENT));
|
||||||
name,
|
|
||||||
transportService,
|
transportService.registerRequestHandler(
|
||||||
clusterService,
|
actionName,
|
||||||
threadPool,
|
executor,
|
||||||
actionFilters,
|
false,
|
||||||
|
true,
|
||||||
XPackUsageRequest::new,
|
XPackUsageRequest::new,
|
||||||
XPackUsageFeatureResponse::new,
|
(request, channel, task) -> executeDirect(task, request, new ChannelActionListener<>(channel))
|
||||||
threadPool.executor(ThreadPool.Names.MANAGEMENT)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class DataTiersUsageTransportAction extends XPackUsageFeatureTransportAct
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -33,7 +33,7 @@ public class EnrichUsageTransportAction extends XPackUsageFeatureTransportAction
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -78,7 +78,7 @@ public class EnterpriseSearchUsageTransportAction extends XPackUsageFeatureTrans
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
@ -153,7 +153,7 @@ public class EnterpriseSearchUsageTransportAction extends XPackUsageFeatureTrans
|
||||||
|
|
||||||
// Step 1: Fetch analytics collections count
|
// Step 1: Fetch analytics collections count
|
||||||
GetAnalyticsCollectionAction.Request analyticsCollectionsCountRequest = new GetAnalyticsCollectionAction.Request(
|
GetAnalyticsCollectionAction.Request analyticsCollectionsCountRequest = new GetAnalyticsCollectionAction.Request(
|
||||||
request.masterNodeTimeout(),
|
request.masterTimeout(),
|
||||||
new String[] { "*" }
|
new String[] { "*" }
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@ public class EqlUsageTransportAction extends XPackUsageFeatureTransportAction {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -100,7 +100,7 @@ public class EqlInfoTransportActionTests extends ESTestCase {
|
||||||
TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool);
|
TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool);
|
||||||
var usageAction = new EqlUsageTransportAction(transportService, clusterService, threadPool, mock(ActionFilters.class), client);
|
var usageAction = new EqlUsageTransportAction(transportService, clusterService, threadPool, mock(ActionFilters.class), client);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> 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();
|
EqlFeatureSetUsage eqlUsage = (EqlFeatureSetUsage) future.get().getUsage();
|
||||||
|
|
||||||
long fooBarBaz = ObjectPath.eval("foo.bar.baz", eqlUsage.stats());
|
long fooBarBaz = ObjectPath.eval("foo.bar.baz", eqlUsage.stats());
|
||||||
|
|
|
@ -46,7 +46,7 @@ public class EsqlUsageTransportAction extends XPackUsageFeatureTransportAction {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -102,7 +102,7 @@ public class EsqlInfoTransportActionTests extends ESTestCase {
|
||||||
|
|
||||||
var usageAction = new EsqlUsageTransportAction(transportService, clusterService, threadPool, mock(ActionFilters.class), client);
|
var usageAction = new EsqlUsageTransportAction(transportService, clusterService, threadPool, mock(ActionFilters.class), client);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> 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();
|
EsqlFeatureSetUsage esqlUsage = (EsqlFeatureSetUsage) future.get().getUsage();
|
||||||
|
|
||||||
long fooBarBaz = ObjectPath.eval("foo.bar.baz", esqlUsage.stats());
|
long fooBarBaz = ObjectPath.eval("foo.bar.baz", esqlUsage.stats());
|
||||||
|
|
|
@ -35,7 +35,7 @@ public class FrozenIndicesUsageTransportAction extends XPackUsageFeatureTranspor
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -43,7 +43,7 @@ public class GraphUsageTransportAction extends XPackUsageFeatureTransportAction
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -54,7 +54,7 @@ public class GraphInfoTransportActionTests extends ESTestCase {
|
||||||
licenseState
|
licenseState
|
||||||
);
|
);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, null, future);
|
usageAction.localClusterStateOperation(null, null, null, future);
|
||||||
XPackFeatureUsage usage = future.get().getUsage();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
assertThat(usage.available(), is(available));
|
assertThat(usage.available(), is(available));
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ public class GraphInfoTransportActionTests extends ESTestCase {
|
||||||
licenseState
|
licenseState
|
||||||
);
|
);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, null, future);
|
usageAction.localClusterStateOperation(null, null, null, future);
|
||||||
XPackFeatureUsage usage = future.get().getUsage();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
assertThat(usage.enabled(), is(enabled));
|
assertThat(usage.enabled(), is(enabled));
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ public class IndexLifecycleUsageTransportAction extends XPackUsageFeatureTranspo
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -94,7 +94,7 @@ public class IndexLifecycleInfoTransportActionTests extends ESTestCase {
|
||||||
TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool);
|
TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool);
|
||||||
var usageAction = new IndexLifecycleUsageTransportAction(transportService, null, threadPool, mock(ActionFilters.class));
|
var usageAction = new IndexLifecycleUsageTransportAction(transportService, null, threadPool, mock(ActionFilters.class));
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, clusterState, future);
|
usageAction.localClusterStateOperation(null, null, clusterState, future);
|
||||||
IndexLifecycleFeatureSetUsage ilmUsage = (IndexLifecycleFeatureSetUsage) future.get().getUsage();
|
IndexLifecycleFeatureSetUsage ilmUsage = (IndexLifecycleFeatureSetUsage) future.get().getUsage();
|
||||||
assertThat(ilmUsage.enabled(), equalTo(true));
|
assertThat(ilmUsage.enabled(), equalTo(true));
|
||||||
assertThat(ilmUsage.available(), equalTo(true));
|
assertThat(ilmUsage.available(), equalTo(true));
|
||||||
|
|
|
@ -48,7 +48,7 @@ public class TransportInferenceUsageAction extends XPackUsageFeatureTransportAct
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -92,7 +92,7 @@ public class TransportInferenceUsageActionTests extends ESTestCase {
|
||||||
}).when(client).execute(any(GetInferenceModelAction.class), any(), any());
|
}).when(client).execute(any(GetInferenceModelAction.class), any(), any());
|
||||||
|
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> 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();
|
BytesStreamOutput out = new BytesStreamOutput();
|
||||||
future.get().getUsage().writeTo(out);
|
future.get().getUsage().writeTo(out);
|
||||||
|
|
|
@ -45,7 +45,7 @@ public class LogsDBUsageTransportAction extends XPackUsageFeatureTransportAction
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -38,7 +38,7 @@ public class LogstashUsageTransportAction extends XPackUsageFeatureTransportActi
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -35,7 +35,7 @@ public class LogstashInfoTransportActionTests extends ESTestCase {
|
||||||
|
|
||||||
LogstashUsageTransportAction usageAction = newUsageAction(false);
|
LogstashUsageTransportAction usageAction = newUsageAction(false);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, null, future);
|
usageAction.localClusterStateOperation(null, null, null, future);
|
||||||
XPackFeatureUsage usage = future.get().getUsage();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
|
|
||||||
BytesStreamOutput out = new BytesStreamOutput();
|
BytesStreamOutput out = new BytesStreamOutput();
|
||||||
|
@ -53,7 +53,7 @@ public class LogstashInfoTransportActionTests extends ESTestCase {
|
||||||
|
|
||||||
var usageAction = newUsageAction(available);
|
var usageAction = newUsageAction(available);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, null, future);
|
usageAction.localClusterStateOperation(null, null, null, future);
|
||||||
XPackFeatureUsage usage = future.get().getUsage();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
assertThat(usage.available(), is(available));
|
assertThat(usage.available(), is(available));
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ public class AggregateMetricUsageTransportAction extends XPackUsageFeatureTransp
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -143,7 +143,7 @@ public class MachineLearningUsageTransportAction extends XPackUsageFeatureTransp
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -200,7 +200,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase {
|
||||||
assertThat(featureSet.available(), is(available));
|
assertThat(featureSet.available(), is(available));
|
||||||
var usageAction = newUsageAction(commonSettings, randomBoolean(), randomBoolean(), randomBoolean());
|
var usageAction = newUsageAction(commonSettings, randomBoolean(), randomBoolean(), randomBoolean());
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future);
|
usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future);
|
||||||
XPackFeatureUsage usage = future.get().getUsage();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
assertThat(usage.available(), is(available));
|
assertThat(usage.available(), is(available));
|
||||||
|
|
||||||
|
@ -230,7 +230,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase {
|
||||||
assertThat(featureSet.enabled(), is(expected));
|
assertThat(featureSet.enabled(), is(expected));
|
||||||
var usageAction = newUsageAction(settings.build(), randomBoolean(), randomBoolean(), randomBoolean());
|
var usageAction = newUsageAction(settings.build(), randomBoolean(), randomBoolean(), randomBoolean());
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future);
|
usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future);
|
||||||
XPackFeatureUsage usage = future.get().getUsage();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
assertThat(usage.enabled(), is(expected));
|
assertThat(usage.enabled(), is(expected));
|
||||||
|
|
||||||
|
@ -251,7 +251,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase {
|
||||||
|
|
||||||
var usageAction = newUsageAction(settings.build(), true, true, true);
|
var usageAction = newUsageAction(settings.build(), true, true, true);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future);
|
usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future);
|
||||||
XPackFeatureUsage mlUsage = future.get().getUsage();
|
XPackFeatureUsage mlUsage = future.get().getUsage();
|
||||||
|
|
||||||
BytesStreamOutput out = new BytesStreamOutput();
|
BytesStreamOutput out = new BytesStreamOutput();
|
||||||
|
@ -409,7 +409,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase {
|
||||||
|
|
||||||
var usageAction = newUsageAction(settings.build(), false, true, true);
|
var usageAction = newUsageAction(settings.build(), false, true, true);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future);
|
usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future);
|
||||||
XPackFeatureUsage mlUsage = future.get().getUsage();
|
XPackFeatureUsage mlUsage = future.get().getUsage();
|
||||||
|
|
||||||
BytesStreamOutput out = new BytesStreamOutput();
|
BytesStreamOutput out = new BytesStreamOutput();
|
||||||
|
@ -505,7 +505,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase {
|
||||||
|
|
||||||
var usageAction = newUsageAction(settings.build(), true, false, false);
|
var usageAction = newUsageAction(settings.build(), true, false, false);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future);
|
usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future);
|
||||||
XPackFeatureUsage mlUsage = future.get().getUsage();
|
XPackFeatureUsage mlUsage = future.get().getUsage();
|
||||||
|
|
||||||
BytesStreamOutput out = new BytesStreamOutput();
|
BytesStreamOutput out = new BytesStreamOutput();
|
||||||
|
@ -602,7 +602,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase {
|
||||||
|
|
||||||
var usageAction = newUsageAction(settings.build(), true, true, true);
|
var usageAction = newUsageAction(settings.build(), true, true, true);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future);
|
usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future);
|
||||||
XPackFeatureUsage usage = future.get().getUsage();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
|
|
||||||
XContentSource source;
|
XContentSource source;
|
||||||
|
@ -637,7 +637,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase {
|
||||||
|
|
||||||
var usageAction = newUsageAction(settings.build(), randomBoolean(), randomBoolean(), randomBoolean());
|
var usageAction = newUsageAction(settings.build(), randomBoolean(), randomBoolean(), randomBoolean());
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future);
|
usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future);
|
||||||
XPackFeatureUsage mlUsage = future.get().getUsage();
|
XPackFeatureUsage mlUsage = future.get().getUsage();
|
||||||
BytesStreamOutput out = new BytesStreamOutput();
|
BytesStreamOutput out = new BytesStreamOutput();
|
||||||
mlUsage.writeTo(out);
|
mlUsage.writeTo(out);
|
||||||
|
@ -659,7 +659,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase {
|
||||||
|
|
||||||
var usageAction = newUsageAction(settings.build(), randomBoolean(), randomBoolean(), randomBoolean());
|
var usageAction = newUsageAction(settings.build(), randomBoolean(), randomBoolean(), randomBoolean());
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, clusterState, future);
|
usageAction.localClusterStateOperation(null, null, clusterState, future);
|
||||||
XPackFeatureUsage usage = future.get().getUsage();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
|
|
||||||
assertThat(usage.available(), is(true));
|
assertThat(usage.available(), is(true));
|
||||||
|
@ -685,7 +685,7 @@ public class MachineLearningInfoTransportActionTests extends ESTestCase {
|
||||||
|
|
||||||
var usageAction = newUsageAction(settings.build(), true, true, true);
|
var usageAction = newUsageAction(settings.build(), true, true, true);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, ClusterState.EMPTY_STATE, future);
|
usageAction.localClusterStateOperation(null, null, ClusterState.EMPTY_STATE, future);
|
||||||
XPackFeatureUsage usage = future.get().getUsage();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
|
|
||||||
assertThat(usage.available(), is(true));
|
assertThat(usage.available(), is(true));
|
||||||
|
|
|
@ -43,7 +43,7 @@ public class MonitoringUsageTransportAction extends XPackUsageFeatureTransportAc
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -101,7 +101,7 @@ public class MonitoringInfoTransportActionTests extends ESTestCase {
|
||||||
new MonitoringUsageServices(monitoring, exporters)
|
new MonitoringUsageServices(monitoring, exporters)
|
||||||
);
|
);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, null, future);
|
usageAction.localClusterStateOperation(null, null, null, future);
|
||||||
MonitoringFeatureSetUsage monitoringUsage = (MonitoringFeatureSetUsage) future.get().getUsage();
|
MonitoringFeatureSetUsage monitoringUsage = (MonitoringFeatureSetUsage) future.get().getUsage();
|
||||||
BytesStreamOutput out = new BytesStreamOutput();
|
BytesStreamOutput out = new BytesStreamOutput();
|
||||||
out.setTransportVersion(serializedVersion);
|
out.setTransportVersion(serializedVersion);
|
||||||
|
|
|
@ -42,7 +42,7 @@ public class ArchiveUsageTransportAction extends XPackUsageFeatureTransportActio
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -43,7 +43,7 @@ public class ProfilingUsageTransportAction extends XPackUsageFeatureTransportAct
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -36,7 +36,7 @@ public class RollupUsageTransportAction extends XPackUsageFeatureTransportAction
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -43,7 +43,7 @@ public class RollupInfoTransportActionTests extends ESTestCase {
|
||||||
TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool);
|
TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool);
|
||||||
var usageAction = new RollupUsageTransportAction(transportService, null, threadPool, mock(ActionFilters.class));
|
var usageAction = new RollupUsageTransportAction(transportService, null, threadPool, mock(ActionFilters.class));
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> 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();
|
RollupFeatureSetUsage rollupUsage = (RollupFeatureSetUsage) future.get().getUsage();
|
||||||
BytesStreamOutput out = new BytesStreamOutput();
|
BytesStreamOutput out = new BytesStreamOutput();
|
||||||
rollupUsage.writeTo(out);
|
rollupUsage.writeTo(out);
|
||||||
|
|
|
@ -42,7 +42,7 @@ public class SearchableSnapshotsUsageTransportAction extends XPackUsageFeatureTr
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -84,7 +84,7 @@ public class SecurityUsageTransportAction extends XPackUsageFeatureTransportActi
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -212,7 +212,7 @@ public class SecurityInfoTransportActionTests extends ESTestCase {
|
||||||
|
|
||||||
var usageAction = newUsageAction(settings.build());
|
var usageAction = newUsageAction(settings.build());
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
usageAction.masterOperation(null, null, null, future);
|
usageAction.localClusterStateOperation(null, null, null, future);
|
||||||
SecurityFeatureSetUsage securityUsage = (SecurityFeatureSetUsage) future.get().getUsage();
|
SecurityFeatureSetUsage securityUsage = (SecurityFeatureSetUsage) future.get().getUsage();
|
||||||
BytesStreamOutput out = new BytesStreamOutput();
|
BytesStreamOutput out = new BytesStreamOutput();
|
||||||
securityUsage.writeTo(out);
|
securityUsage.writeTo(out);
|
||||||
|
|
|
@ -35,7 +35,7 @@ public class SLMUsageTransportAction extends XPackUsageFeatureTransportAction {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class SpatialUsageTransportAction extends XPackUsageFeatureTransportActio
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -71,7 +71,7 @@ public class SpatialInfoTransportActionTests extends ESTestCase {
|
||||||
);
|
);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
||||||
Task task = new Task(1L, "_type", "_action", "_description", null, Collections.emptyMap());
|
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();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
assertThat(usage.available(), is(true));
|
assertThat(usage.available(), is(true));
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ public class SpatialInfoTransportActionTests extends ESTestCase {
|
||||||
mockClient()
|
mockClient()
|
||||||
);
|
);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> 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();
|
XPackFeatureUsage usage = future.get().getUsage();
|
||||||
assertTrue(usage.enabled());
|
assertTrue(usage.enabled());
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ public class SqlUsageTransportAction extends XPackUsageFeatureTransportAction {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -97,7 +97,7 @@ public class SqlInfoTransportActionTests extends ESTestCase {
|
||||||
TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool);
|
TransportService transportService = MockUtils.setupTransportServiceWithThreadpoolExecutor(threadPool);
|
||||||
var usageAction = new SqlUsageTransportAction(transportService, clusterService, threadPool, mock(ActionFilters.class), client);
|
var usageAction = new SqlUsageTransportAction(transportService, clusterService, threadPool, mock(ActionFilters.class), client);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> 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();
|
SqlFeatureSetUsage sqlUsage = (SqlFeatureSetUsage) future.get().getUsage();
|
||||||
|
|
||||||
long fooBarBaz = ObjectPath.eval("foo.bar.baz", sqlUsage.stats());
|
long fooBarBaz = ObjectPath.eval("foo.bar.baz", sqlUsage.stats());
|
||||||
|
|
|
@ -84,7 +84,7 @@ public class TransformUsageTransportAction extends XPackUsageFeatureTransportAct
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState clusterState,
|
ClusterState clusterState,
|
||||||
|
|
|
@ -34,7 +34,7 @@ public class VotingOnlyUsageTransportAction extends XPackUsageFeatureTransportAc
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -59,7 +59,7 @@ public class WatcherUsageTransportAction extends XPackUsageFeatureTransportActio
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void masterOperation(
|
protected void localClusterStateOperation(
|
||||||
Task task,
|
Task task,
|
||||||
XPackUsageRequest request,
|
XPackUsageRequest request,
|
||||||
ClusterState state,
|
ClusterState state,
|
||||||
|
|
|
@ -143,7 +143,7 @@ public class WatcherInfoTransportActionTests extends ESTestCase {
|
||||||
client
|
client
|
||||||
);
|
);
|
||||||
PlainActionFuture<XPackUsageFeatureResponse> future = new PlainActionFuture<>();
|
PlainActionFuture<XPackUsageFeatureResponse> 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();
|
WatcherFeatureSetUsage watcherUsage = (WatcherFeatureSetUsage) future.get().getUsage();
|
||||||
assertThat(watcherUsage.stats().keySet(), containsInAnyOrder("foo", "spam"));
|
assertThat(watcherUsage.stats().keySet(), containsInAnyOrder("foo", "spam"));
|
||||||
long fooBarBaz = ObjectPath.eval("foo.bar.baz", watcherUsage.stats());
|
long fooBarBaz = ObjectPath.eval("foo.bar.baz", watcherUsage.stats());
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue