Fix build

Author: alexey-ivanov-es

server/src/internalClusterTest/java/org/elasticsearch/indices/SystemIndexMappingUpdateServiceIT.java

@@ -117,7 +117,7 @@ public void testSystemIndexManagerUpgradesMappingsOfReindexedIndex() throws Exce
         ensureGreen(reindexedIndexName);
         assertAcked(
             indicesAdmin().aliases(
-                new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).addAliasAction(
+                new IndicesAliasesRequest().addAliasAction(
                     IndicesAliasesRequest.AliasActions.add().index(reindexedIndexName).alias(PRIMARY_INDEX_NAME)
                 ).addAliasAction(IndicesAliasesRequest.AliasActions.add().index(reindexedIndexName).alias(INDEX_NAME))
             ).actionGet()

server/src/main/java/org/elasticsearch/indices/SystemIndexMappingUpdateService.java

@@ -229,7 +229,7 @@ public void onFailure(Exception e) {
      * @return a summary of the index state, or <code>null</code> if the index doesn't exist
      */
     static State calculateIndexState(ClusterState state, SystemIndexDescriptor descriptor) {
-        IndexMetadata indexMetadata = getSystemIndexMetadata(state, descriptor);
+        IndexMetadata indexMetadata = getSystemIndexMetadata(state.metadata(), descriptor);
 
         if (indexMetadata == null) {
             return null;
@@ -258,16 +258,15 @@ static State calculateIndexState(ClusterState state, SystemIndexDescriptor descr
         return new State(indexState, indexHealth, isIndexUpToDate, isMappingIsUpToDate);
     }
 
-    private static IndexMetadata getSystemIndexMetadata(ProjectState state, SystemIndexDescriptor descriptor) {
+    private static IndexMetadata getSystemIndexMetadata(Metadata metadata, SystemIndexDescriptor descriptor) {
         String primaryIndexName = descriptor.getPrimaryIndex();
-        ProjectMetadata projectMetadata = state.metadata();
-        IndexMetadata indexMetadata = projectMetadata.index(primaryIndexName);
+        IndexMetadata indexMetadata = metadata.index(primaryIndexName);
         if (indexMetadata == null) {
             // The primary index name might be an alias pointing to the concrete index
             // (e.g. ".fleet-agents-7" → ".fleet-agents-7-reindexed-for-9").
-            IndexAbstraction indexAbstraction = projectMetadata.getIndicesLookup().get(primaryIndexName);
+            IndexAbstraction indexAbstraction = metadata.getIndicesLookup().get(primaryIndexName);
             if (indexAbstraction != null && indexAbstraction.getWriteIndex() != null) {
-                indexMetadata = projectMetadata.getIndexSafe(indexAbstraction.getWriteIndex());
+                indexMetadata = metadata.getIndexSafe(indexAbstraction.getWriteIndex());
             }
         }
         return indexMetadata;

server/src/test/java/org/elasticsearch/indices/SystemIndexMappingUpdateServiceTests.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.cluster.ClusterChangedEvent;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.TestShardRoutingRoleStrategies;
 import org.elasticsearch.cluster.metadata.AliasMetadata;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.Metadata;
@@ -279,7 +280,6 @@ public void testManagerSubmitsPutRequest() {
      */
     public void testManagerDetectsOutdatedMappingsInReindexedIndex() {
         final String reindexedIndexName = SYSTEM_INDEX_NAME + SystemIndices.UPGRADED_INDEX_SUFFIX;
-        final var projectId = randomProjectIdOrDefault();
 
         // Simulate the post-migration state: the concrete index has the reindexed suffix and an
         // outdated managed_index_mappings_version, while the original primary index name and the
@@ -290,21 +290,19 @@ public void testManagerDetectsOutdatedMappingsInReindexedIndex() {
             .putAlias(AliasMetadata.builder(SYSTEM_INDEX_NAME).build())
             .putAlias(AliasMetadata.builder(DESCRIPTOR.getAliasName()).build());
 
-        final Metadata metadata = Metadata.builder()
-            .generateClusterUuidIfNeeded()
-            .put(ProjectMetadata.builder(projectId).put(reindexedIndexMeta))
-            .build();
+        final Metadata metadata = Metadata.builder().generateClusterUuidIfNeeded().put(reindexedIndexMeta).build();
         final DiscoveryNode node = DiscoveryNodeUtils.builder("1").roles(new HashSet<>(DiscoveryNodeRole.roles())).build();
         final DiscoveryNodes nodes = DiscoveryNodes.builder().add(node).masterNodeId(node.getId()).localNodeId(node.getId()).build();
         final ClusterState clusterState = ClusterState.builder(CLUSTER_NAME)
             .nodes(nodes)
             .metadata(metadata)
-            .routingTable(GlobalRoutingTableTestHelper.buildRoutingTable(metadata, RoutingTable.Builder::addAsNew))
+            .routingTable(
+                RoutingTable.builder(TestShardRoutingRoleStrategies.DEFAULT_ROLE_ONLY).addAsNew(metadata.index(reindexedIndexName))
+            )
             .build();
-        ProjectState projectState = clusterState.projectState(projectId);
 
         assertThat(
-            SystemIndexMappingUpdateService.getUpgradeStatus(projectState, DESCRIPTOR),
+            SystemIndexMappingUpdateService.getUpgradeStatus(clusterState, DESCRIPTOR),
             equalTo(UpgradeStatus.NEEDS_MAPPINGS_UPDATE)
         );
     }