Skip to content

Commit 36ad41b

Browse files
committed
Refactor some ILM tests to not use deprecated methods
And updates `MetadataMigrateToDataTiersRoutingService` to accept a `ProjectState` instead of a `ProjectResolver`.
1 parent ec7f77b commit 36ad41b

File tree

5 files changed

+258
-492
lines changed

5 files changed

+258
-492
lines changed

server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,12 +1494,6 @@ public Builder templates(Map<String, IndexTemplateMetadata> templates) {
14941494
return this;
14951495
}
14961496

1497-
@Deprecated(forRemoval = true)
1498-
public Builder put(String name, ComponentTemplate componentTemplate) {
1499-
getSingleProject().put(name, componentTemplate);
1500-
return this;
1501-
}
1502-
15031497
@Deprecated(forRemoval = true)
15041498
public Builder componentTemplates(Map<String, ComponentTemplate> componentTemplates) {
15051499
getSingleProject().componentTemplates(componentTemplates);
@@ -1540,12 +1534,6 @@ public boolean put(String aliasName, String dataStream, Boolean isWriteDataStrea
15401534
return getSingleProject().put(aliasName, dataStream, isWriteDataStream, filter);
15411535
}
15421536

1543-
@Deprecated(forRemoval = true)
1544-
public Builder removeDataStream(String name) {
1545-
getSingleProject().removeDataStream(name);
1546-
return this;
1547-
}
1548-
15491537
public Builder putCustom(String type, ClusterCustom custom) {
15501538
customs.put(type, Objects.requireNonNull(custom, type));
15511539
return this;

x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/cluster/metadata/MetadataMigrateToDataTiersRoutingService.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.apache.logging.log4j.Logger;
1212
import org.elasticsearch.client.internal.Client;
1313
import org.elasticsearch.cluster.ClusterState;
14+
import org.elasticsearch.cluster.ProjectState;
1415
import org.elasticsearch.cluster.metadata.ComponentTemplate;
1516
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
1617
import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -19,7 +20,6 @@
1920
import org.elasticsearch.cluster.metadata.Metadata;
2021
import org.elasticsearch.cluster.metadata.ProjectMetadata;
2122
import org.elasticsearch.cluster.metadata.Template;
22-
import org.elasticsearch.cluster.project.ProjectResolver;
2323
import org.elasticsearch.cluster.routing.allocation.DataTier;
2424
import org.elasticsearch.common.Strings;
2525
import org.elasticsearch.common.settings.Settings;
@@ -178,16 +178,15 @@ private MetadataMigrateToDataTiersRoutingService() {}
178178
* ILM routing allocations. It also returns a summary of the affected abstractions encapsulated in {@link MigratedEntities}
179179
*/
180180
public static Tuple<ClusterState, MigratedEntities> migrateToDataTiersRouting(
181-
ClusterState currentState,
182-
ProjectResolver projectResolver,
181+
ProjectState currentState,
183182
@Nullable String nodeAttrName,
184183
@Nullable String indexTemplateToDelete,
185184
NamedXContentRegistry xContentRegistry,
186185
Client client,
187186
XPackLicenseState licenseState,
188187
boolean dryRun
189188
) {
190-
ProjectMetadata currentProjectMetadata = projectResolver.getProjectMetadata(currentState);
189+
ProjectMetadata currentProjectMetadata = currentState.metadata();
191190
if (dryRun == false) {
192191
IndexLifecycleMetadata currentMetadata = currentProjectMetadata.custom(IndexLifecycleMetadata.TYPE);
193192
if (currentMetadata != null && currentILMMode(currentProjectMetadata) != STOPPED) {
@@ -197,7 +196,7 @@ public static Tuple<ClusterState, MigratedEntities> migrateToDataTiersRouting(
197196
}
198197
}
199198

200-
Metadata.Builder mb = Metadata.builder(currentState.metadata());
199+
Metadata.Builder mb = Metadata.builder(currentState.cluster().metadata());
201200
ProjectMetadata.Builder newProjectMetadataBuilder = ProjectMetadata.builder(currentProjectMetadata);
202201

203202
// remove ENFORCE_DEFAULT_TIER_PREFERENCE from the persistent settings
@@ -245,7 +244,7 @@ public static Tuple<ClusterState, MigratedEntities> migrateToDataTiersRouting(
245244
attribute
246245
);
247246
return Tuple.tuple(
248-
ClusterState.builder(currentState).metadata(mb).putProjectMetadata(newProjectMetadataBuilder).build(),
247+
ClusterState.builder(currentState.cluster()).metadata(mb).putProjectMetadata(newProjectMetadataBuilder).build(),
249248
new MigratedEntities(removedIndexTemplateName, migratedIndices, migratedPolicies, migratedTemplates)
250249
);
251250
}

x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportMigrateToDataTiersAction.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ protected void masterOperation(
9090
ClusterState state,
9191
ActionListener<MigrateToDataTiersResponse> listener
9292
) throws Exception {
93+
final var projectId = projectResolver.getProjectId();
9394
if (request.isDryRun()) {
9495
MigratedEntities entities = migrateToDataTiersRouting(
95-
state,
96-
projectResolver,
96+
state.projectState(projectId),
9797
request.getNodeAttributeName(),
9898
request.getLegacyTemplateToDelete(),
9999
xContentRegistry,
@@ -131,8 +131,7 @@ protected void masterOperation(
131131
@Override
132132
public ClusterState execute(ClusterState currentState) {
133133
Tuple<ClusterState, MigratedEntities> migratedEntitiesTuple = migrateToDataTiersRouting(
134-
currentState,
135-
projectResolver,
134+
currentState.projectState(projectId),
136135
request.getNodeAttributeName(),
137136
request.getLegacyTemplateToDelete(),
138137
xContentRegistry,

0 commit comments

Comments
 (0)