1111import org .apache .logging .log4j .Logger ;
1212import org .elasticsearch .client .internal .Client ;
1313import org .elasticsearch .cluster .ClusterState ;
14+ import org .elasticsearch .cluster .ProjectState ;
1415import org .elasticsearch .cluster .metadata .ComponentTemplate ;
1516import org .elasticsearch .cluster .metadata .ComposableIndexTemplate ;
1617import org .elasticsearch .cluster .metadata .IndexMetadata ;
1920import org .elasticsearch .cluster .metadata .Metadata ;
2021import org .elasticsearch .cluster .metadata .ProjectMetadata ;
2122import org .elasticsearch .cluster .metadata .Template ;
22- import org .elasticsearch .cluster .project .ProjectResolver ;
2323import org .elasticsearch .cluster .routing .allocation .DataTier ;
2424import org .elasticsearch .common .Strings ;
2525import 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 }
0 commit comments