Skip to content

Commit e863f7a

Browse files
samxbrsamxbr
committed
more xpack usage actions
1 parent 348e040 commit e863f7a

File tree

17 files changed

+62
-62
lines changed

17 files changed

+62
-62
lines changed

‎x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/DataTiersUsageRestCancellationIT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.elasticsearch.xpack.core.action.XPackUsageFeatureAction;
3636
import org.elasticsearch.xpack.core.action.XPackUsageFeatureResponse;
3737
import org.elasticsearch.xpack.core.action.XPackUsageResponse;
38-
import org.elasticsearch.xpack.core.datatiers.NodesDataTiersUsageTransportAction;
38+
import org.elasticsearch.xpack.core.datatiers.TransportNodesDataTiersUsageAction;
3939

4040
import java.nio.file.Path;
4141
import java.util.Arrays;
@@ -77,7 +77,7 @@ public void testCancellation() throws Exception {
7777
final SubscribableListener<Void> nodeStatsRequestsReleaseListener = new SubscribableListener<>();
7878
for (TransportService transportService : internalCluster().getInstances(TransportService.class)) {
7979
((MockTransportService) transportService).addRequestHandlingBehavior(
80-
NodesDataTiersUsageTransportAction.TYPE.name() + "[n]",
80+
TransportNodesDataTiersUsageAction.TYPE.name() + "[n]",
8181
(handler, request, channel, task) -> {
8282
tasksBlockedLatch.countDown();
8383
nodeStatsRequestsReleaseListener.addListener(
@@ -95,13 +95,13 @@ public void testCancellation() throws Exception {
9595
safeAwait(tasksBlockedLatch); // must wait for the node-level tasks to start to avoid cancelling being handled earlier
9696
cancellable.cancel();
9797

98-
assertAllCancellableTasksAreCancelled(NodesDataTiersUsageTransportAction.TYPE.name());
98+
assertAllCancellableTasksAreCancelled(TransportNodesDataTiersUsageAction.TYPE.name());
9999
assertAllCancellableTasksAreCancelled(XPackUsageAction.NAME);
100100

101101
nodeStatsRequestsReleaseListener.onResponse(null);
102102
expectThrows(CancellationException.class, future::actionGet);
103103

104-
assertAllTasksHaveFinished(NodesDataTiersUsageTransportAction.TYPE.name());
104+
assertAllTasksHaveFinished(TransportNodesDataTiersUsageAction.TYPE.name());
105105
assertAllTasksHaveFinished(XPackUsageAction.NAME);
106106
}
107107

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@
9898
import org.elasticsearch.xpack.core.action.XPackUsageFeatureAction;
9999
import org.elasticsearch.xpack.core.action.XPackUsageResponse;
100100
import org.elasticsearch.xpack.core.async.TransportDeleteAsyncResultAction;
101-
import org.elasticsearch.xpack.core.datatiers.DataTiersInfoTransportAction;
102-
import org.elasticsearch.xpack.core.datatiers.DataTiersUsageTransportAction;
103-
import org.elasticsearch.xpack.core.datatiers.NodesDataTiersUsageTransportAction;
101+
import org.elasticsearch.xpack.core.datatiers.TransportDataTiersInfoAction;
102+
import org.elasticsearch.xpack.core.datatiers.TransportDataTiersUsageAction;
103+
import org.elasticsearch.xpack.core.datatiers.TransportNodesDataTiersUsageAction;
104104
import org.elasticsearch.xpack.core.ml.MlMetadata;
105105
import org.elasticsearch.xpack.core.rest.action.RestXPackInfoAction;
106106
import org.elasticsearch.xpack.core.rest.action.RestXPackUsageAction;
@@ -365,14 +365,14 @@ public List<ActionHandler> getActions() {
365365
actions.add(new ActionHandler(TransportGetFeatureUsageAction.TYPE, TransportGetFeatureUsageAction.class));
366366
actions.add(new ActionHandler(TermsEnumAction.INSTANCE, TransportTermsEnumAction.class));
367367
actions.add(new ActionHandler(TransportDeleteAsyncResultAction.TYPE, TransportDeleteAsyncResultAction.class));
368-
actions.add(new ActionHandler(XPackInfoFeatureAction.DATA_TIERS, DataTiersInfoTransportAction.class));
369-
actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_TIERS, DataTiersUsageTransportAction.class));
368+
actions.add(new ActionHandler(XPackInfoFeatureAction.DATA_TIERS, TransportDataTiersInfoAction.class));
369+
actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_TIERS, TransportDataTiersUsageAction.class));
370370
actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_STREAMS, TransportDataStreamUsageAction.class));
371371
actions.add(new ActionHandler(XPackInfoFeatureAction.DATA_STREAMS, TransportDataStreamInfoAction.class));
372372
actions.add(new ActionHandler(XPackUsageFeatureAction.DATA_STREAM_LIFECYCLE, TransportDataStreamLifecycleUsageAction.class));
373373
actions.add(new ActionHandler(XPackUsageFeatureAction.HEALTH, TransportHealthApiUsageAction.class));
374374
actions.add(new ActionHandler(XPackUsageFeatureAction.REMOTE_CLUSTERS, TransportRemoteClusterUsageAction.class));
375-
actions.add(new ActionHandler(NodesDataTiersUsageTransportAction.TYPE, NodesDataTiersUsageTransportAction.class));
375+
actions.add(new ActionHandler(TransportNodesDataTiersUsageAction.TYPE, TransportNodesDataTiersUsageAction.class));
376376
return actions;
377377
}
378378

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersInfoTransportAction.java‎ renamed to ‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersInfoAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction;
1515
import org.elasticsearch.xpack.core.action.XPackInfoFeatureTransportAction;
1616

17-
public class DataTiersInfoTransportAction extends XPackInfoFeatureTransportAction {
17+
public class TransportDataTiersInfoAction extends XPackInfoFeatureTransportAction {
1818

1919
@Inject
20-
public DataTiersInfoTransportAction(TransportService transportService, ActionFilters actionFilters) {
20+
public TransportDataTiersInfoAction(TransportService transportService, ActionFilters actionFilters) {
2121
super(XPackInfoFeatureAction.DATA_TIERS.name(), transportService, actionFilters);
2222
}
2323

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportAction.java‎ renamed to ‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersUsageAction.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
import java.util.stream.Collectors;
4343
import java.util.stream.StreamSupport;
4444

45-
public class DataTiersUsageTransportAction extends XPackUsageFeatureTransportAction {
45+
public class TransportDataTiersUsageAction extends XPackUsageFeatureTransportAction {
4646

4747
private final Client client;
4848
private final ProjectResolver projectResolver;
4949

5050
@Inject
51-
public DataTiersUsageTransportAction(
51+
public TransportDataTiersUsageAction(
5252
TransportService transportService,
5353
ClusterService clusterService,
5454
ThreadPool threadPool,
@@ -71,8 +71,8 @@ protected void localClusterStateOperation(
7171
new ParentTaskAssigningClient(client, clusterService.localNode(), task).admin()
7272
.cluster()
7373
.execute(
74-
NodesDataTiersUsageTransportAction.TYPE,
75-
new NodesDataTiersUsageTransportAction.NodesRequest(),
74+
TransportNodesDataTiersUsageAction.TYPE,
75+
new TransportNodesDataTiersUsageAction.NodesRequest(),
7676
listener.delegateFailureAndWrap((delegate, response) -> {
7777
final var projectState = projectResolver.getProjectState(state);
7878
// Generate tier specific stats for the nodes and indices
@@ -212,8 +212,8 @@ static long computeMedianAbsoluteDeviation(TDigestState valuesSketch) {
212212
}
213213

214214
/**
215-
* In this method we use {@link NodesDataTiersUsageTransportAction#aggregateStats(RoutingNode, Metadata, NodeIndicesStats)}
216-
* to precalculate the stats we need from {@link NodeStats} just like we do in NodesDataTiersUsageTransportAction.
215+
* In this method we use {@link TransportNodesDataTiersUsageAction#aggregateStats(RoutingNode, Metadata, NodeIndicesStats)}
216+
* to precalculate the stats we need from {@link NodeStats} just like we do in TransportNodesDataTiersUsageAction.
217217
* This way we can be backwards compatible without duplicating the calculation. This is only meant to be used to be
218218
* backwards compatible and it should be removed afterwords.
219219
*/
@@ -223,6 +223,6 @@ private static Map<String, NodeDataTiersUsage.UsageStats> precalculateLocalStats
223223
return Map.of();
224224
}
225225

226-
return NodesDataTiersUsageTransportAction.aggregateStats(routingNode, state.metadata(), nodeStats.getIndices());
226+
return TransportNodesDataTiersUsageAction.aggregateStats(routingNode, state.metadata(), nodeStats.getIndices());
227227
}
228228
}

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/NodesDataTiersUsageTransportAction.java‎ renamed to ‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datatiers/TransportNodesDataTiersUsageAction.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
/**
5050
* Sources locally data tier usage stats mainly indices and shard sizes grouped by preferred data tier.
5151
*/
52-
public class NodesDataTiersUsageTransportAction extends TransportNodesAction<
53-
NodesDataTiersUsageTransportAction.NodesRequest,
54-
NodesDataTiersUsageTransportAction.NodesResponse,
55-
NodesDataTiersUsageTransportAction.NodeRequest,
52+
public class TransportNodesDataTiersUsageAction extends TransportNodesAction<
53+
TransportNodesDataTiersUsageAction.NodesRequest,
54+
TransportNodesDataTiersUsageAction.NodesResponse,
55+
TransportNodesDataTiersUsageAction.NodeRequest,
5656
NodeDataTiersUsage,
5757
Void> {
5858

@@ -65,7 +65,7 @@ public class NodesDataTiersUsageTransportAction extends TransportNodesAction<
6565
private final IndicesService indicesService;
6666

6767
@Inject
68-
public NodesDataTiersUsageTransportAction(
68+
public TransportNodesDataTiersUsageAction(
6969
ThreadPool threadPool,
7070
ClusterService clusterService,
7171
TransportService transportService,

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/DataTiersUsageTransportActionTests.java‎ renamed to ‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/TransportDataTiersUsageActionTests.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import static org.hamcrest.Matchers.is;
3434
import static org.hamcrest.Matchers.notNullValue;
3535

36-
public class DataTiersUsageTransportActionTests extends ESTestCase {
36+
public class TransportDataTiersUsageActionTests extends ESTestCase {
3737

3838
private long byteSize;
3939
private long docCount;
@@ -78,7 +78,7 @@ public void testTierIndices() {
7878
.putProjectMetadata(projectBuilder)
7979
.putRoutingTable(projectBuilder.getId(), routingTableBuilder.build())
8080
.build();
81-
Map<String, Set<String>> result = DataTiersUsageTransportAction.getIndicesGroupedByTier(
81+
Map<String, Set<String>> result = TransportDataTiersUsageAction.getIndicesGroupedByTier(
8282
clusterState.projectState(projectBuilder.getId()),
8383
List.of(new NodeDataTiersUsage(dataNode, Map.of(DataTier.DATA_WARM, createStats(5, 5, 0, 10))))
8484
);
@@ -90,7 +90,7 @@ public void testTierIndices() {
9090

9191
public void testCalculateMAD() {
9292
assertThat(
93-
DataTiersUsageTransportAction.computeMedianAbsoluteDeviation(TDigestState.createWithoutCircuitBreaking(10)),
93+
TransportDataTiersUsageAction.computeMedianAbsoluteDeviation(TDigestState.createWithoutCircuitBreaking(10)),
9494
equalTo(0L)
9595
);
9696

@@ -102,7 +102,7 @@ public void testCalculateMAD() {
102102
sketch.add(4);
103103
sketch.add(6);
104104
sketch.add(9);
105-
assertThat(DataTiersUsageTransportAction.computeMedianAbsoluteDeviation(sketch), equalTo(1L));
105+
assertThat(TransportDataTiersUsageAction.computeMedianAbsoluteDeviation(sketch), equalTo(1L));
106106
}
107107

108108
public void testCalculateStatsNoTiers() {
@@ -114,7 +114,7 @@ public void testCalculateStatsNoTiers() {
114114
new NodeDataTiersUsage(leader, Map.of()),
115115
new NodeDataTiersUsage(dataNode1, Map.of())
116116
);
117-
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = DataTiersUsageTransportAction.aggregateStats(
117+
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = TransportDataTiersUsageAction.aggregateStats(
118118
nodeDataTiersUsages,
119119
Map.of()
120120
);
@@ -141,7 +141,7 @@ public void testCalculateStatsTieredNodesOnly() {
141141
new NodeDataTiersUsage(frozenNode1, Map.of())
142142
);
143143

144-
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = DataTiersUsageTransportAction.aggregateStats(
144+
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = TransportDataTiersUsageAction.aggregateStats(
145145
nodeDataTiersUsages,
146146
Map.of()
147147
);
@@ -254,7 +254,7 @@ public void testCalculateStatsTieredIndicesOnly() {
254254
)
255255
);
256256
// Calculate usage
257-
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = DataTiersUsageTransportAction.aggregateStats(
257+
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = TransportDataTiersUsageAction.aggregateStats(
258258
nodeDataTiersUsages,
259259
Map.of(
260260
DataTier.DATA_HOT,
@@ -345,7 +345,7 @@ public void testCalculateStatsReasonableCase() {
345345

346346
);
347347
// Calculate usage
348-
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = DataTiersUsageTransportAction.aggregateStats(
348+
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = TransportDataTiersUsageAction.aggregateStats(
349349
nodeDataTiersUsages,
350350
Map.of(
351351
DataTier.DATA_HOT,
@@ -428,7 +428,7 @@ public void testCalculateStatsMixedTiers() {
428428
);
429429

430430
// Calculate usage
431-
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = DataTiersUsageTransportAction.aggregateStats(
431+
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = TransportDataTiersUsageAction.aggregateStats(
432432
nodeDataTiersUsages,
433433
Map.of(DataTier.DATA_HOT, Set.of(hotIndex1), DataTier.DATA_WARM, Set.of(warmIndex1, warmIndex2))
434434
);
@@ -487,7 +487,7 @@ public void testCalculateStatsStuckInWrongTier() {
487487
);
488488

489489
// Calculate usage
490-
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = DataTiersUsageTransportAction.aggregateStats(
490+
Map<String, DataTiersFeatureSetUsage.TierSpecificStats> tierSpecificStats = TransportDataTiersUsageAction.aggregateStats(
491491
nodeDataTiersUsages,
492492
Map.of(DataTier.DATA_HOT, Set.of(hotIndex1), DataTier.DATA_WARM, Set.of(warmIndex1))
493493
);

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/NodesDataTiersUsageTransportActionTests.java‎ renamed to ‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/TransportNodesDataTiersUsageActionTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import static org.hamcrest.Matchers.is;
3333
import static org.hamcrest.Matchers.notNullValue;
3434

35-
public class NodesDataTiersUsageTransportActionTests extends ESTestCase {
35+
public class TransportNodesDataTiersUsageActionTests extends ESTestCase {
3636

3737
private long byteSize;
3838
private long docCount;
@@ -76,7 +76,7 @@ public void testCalculateStatsNoTiers() {
7676
);
7777

7878
// Calculate usage
79-
Map<String, NodeDataTiersUsage.UsageStats> usageStats = NodesDataTiersUsageTransportAction.aggregateStats(
79+
Map<String, NodeDataTiersUsage.UsageStats> usageStats = TransportNodesDataTiersUsageAction.aggregateStats(
8080
clusterState.getRoutingNodes().node(dataNode1.getId()),
8181
clusterState.metadata(),
8282
nodeIndicesStats
@@ -110,7 +110,7 @@ public void testCalculateStatsNoIndices() {
110110
);
111111

112112
// Calculate usage
113-
Map<String, NodeDataTiersUsage.UsageStats> usageStats = NodesDataTiersUsageTransportAction.aggregateStats(
113+
Map<String, NodeDataTiersUsage.UsageStats> usageStats = TransportNodesDataTiersUsageAction.aggregateStats(
114114
clusterState.getRoutingNodes().node(dataNode1.getId()),
115115
clusterState.metadata(),
116116
nodeIndicesStats
@@ -181,7 +181,7 @@ public void testCalculateStatsTieredIndicesOnly() {
181181
);
182182

183183
// Calculate usage
184-
Map<String, NodeDataTiersUsage.UsageStats> usageStats = NodesDataTiersUsageTransportAction.aggregateStats(
184+
Map<String, NodeDataTiersUsage.UsageStats> usageStats = TransportNodesDataTiersUsageAction.aggregateStats(
185185
clusterState.getRoutingNodes().node(dataNode1.getId()),
186186
clusterState.metadata(),
187187
nodeIndicesStats

‎x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPlugin.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
import org.elasticsearch.xpack.core.enrich.action.PutEnrichPolicyAction;
4848
import org.elasticsearch.xpack.enrich.action.EnrichCoordinatorProxyAction;
4949
import org.elasticsearch.xpack.enrich.action.EnrichCoordinatorStatsAction;
50-
import org.elasticsearch.xpack.enrich.action.EnrichInfoTransportAction;
50+
import org.elasticsearch.xpack.enrich.action.TransportEnrichInfoAction;
5151
import org.elasticsearch.xpack.enrich.action.EnrichReindexAction;
5252
import org.elasticsearch.xpack.enrich.action.EnrichShardMultiSearchAction;
53-
import org.elasticsearch.xpack.enrich.action.EnrichUsageTransportAction;
53+
import org.elasticsearch.xpack.enrich.action.TransportEnrichUsageAction;
5454
import org.elasticsearch.xpack.enrich.action.InternalExecutePolicyAction;
5555
import org.elasticsearch.xpack.enrich.action.TransportDeleteEnrichPolicyAction;
5656
import org.elasticsearch.xpack.enrich.action.TransportEnrichReindexAction;
@@ -211,8 +211,8 @@ protected XPackLicenseState getLicenseState() {
211211
@Override
212212
public List<ActionHandler> getActions() {
213213
return List.of(
214-
new ActionHandler(XPackInfoFeatureAction.ENRICH, EnrichInfoTransportAction.class),
215-
new ActionHandler(XPackUsageFeatureAction.ENRICH, EnrichUsageTransportAction.class),
214+
new ActionHandler(XPackInfoFeatureAction.ENRICH, TransportEnrichInfoAction.class),
215+
new ActionHandler(XPackUsageFeatureAction.ENRICH, TransportEnrichUsageAction.class),
216216
new ActionHandler(GetEnrichPolicyAction.INSTANCE, TransportGetEnrichPolicyAction.class),
217217
new ActionHandler(DeleteEnrichPolicyAction.INSTANCE, TransportDeleteEnrichPolicyAction.class),
218218
new ActionHandler(PutEnrichPolicyAction.INSTANCE, TransportPutEnrichPolicyAction.class),

‎x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichInfoTransportAction.java‎ renamed to ‎x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichInfoAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import org.elasticsearch.xpack.core.action.XPackInfoFeatureAction;
1414
import org.elasticsearch.xpack.core.action.XPackInfoFeatureTransportAction;
1515

16-
public class EnrichInfoTransportAction extends XPackInfoFeatureTransportAction {
16+
public class TransportEnrichInfoAction extends XPackInfoFeatureTransportAction {
1717

1818
@Inject
19-
public EnrichInfoTransportAction(TransportService transportService, ActionFilters actionFilters) {
19+
public TransportEnrichInfoAction(TransportService transportService, ActionFilters actionFilters) {
2020
super(XPackInfoFeatureAction.ENRICH.name(), transportService, actionFilters);
2121
}
2222

‎x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/EnrichUsageTransportAction.java‎ renamed to ‎x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/action/TransportEnrichUsageAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import org.elasticsearch.xpack.core.action.XPackUsageFeatureTransportAction;
2121
import org.elasticsearch.xpack.core.enrich.EnrichFeatureSetUsage;
2222

23-
public class EnrichUsageTransportAction extends XPackUsageFeatureTransportAction {
23+
public class TransportEnrichUsageAction extends XPackUsageFeatureTransportAction {
2424

2525
@Inject
26-
public EnrichUsageTransportAction(
26+
public TransportEnrichUsageAction(
2727
TransportService transportService,
2828
ClusterService clusterService,
2929
ThreadPool threadPool,

0 commit comments

Comments
 (0)