Fixes after merge

Author: alexey-ivanov-es

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

@@ -156,7 +156,7 @@ static ClusterState migrateToDataStream(
         ProjectMetadata.Builder mb = ProjectMetadata.builder(project);
         for (Index index : alias.getIndices()) {
             IndexMetadata im = project.index(index);
-            prepareBackingIndex(mb, im, request.aliasName, mapperSupplier, true, false, Settings.EMPTY);
+            prepareBackingIndex(mb, im, request.aliasName, mapperSupplier, true, false, false, Settings.EMPTY);
         }
         ClusterState updatedState = ClusterState.builder(projectState.cluster()).putProjectMetadata(mb).build();
 
@@ -201,17 +201,6 @@ static void validateRequest(ProjectMetadata project, MigrateToDataStreamClusterS
         }
     }
 
-    // hides the index, optionally removes the alias, and adds data stream timestamp field mapper
-    static void prepareBackingIndex(
-        ProjectMetadata.Builder b,
-        IndexMetadata im,
-        String dataStreamName,
-        Function<IndexMetadata, MapperService> mapperSupplier,
-        boolean removeAlias
-    ) throws IOException {
-        prepareBackingIndex(b, im, dataStreamName, mapperSupplier, removeAlias, false, false, Settings.EMPTY);
-    }
-
     /**
      * Hides the index, optionally removes the alias, adds data stream timestamp field mapper, and configures any additional settings
      * needed for the index to be included within a data stream.

server/src/main/java/org/elasticsearch/cluster/routing/allocation/shards/ShardsAvailabilityHealthIndicatorService.java

@@ -1152,7 +1152,8 @@ public List<HealthIndicatorImpact> getImpacts() {
 
         /**
          * Returns the diagnosis for unassigned primary and replica shards.
-         * @param verbose true if the diagnosis should be generated, false if they should be omitted.
+         *
+         * @param verbose                   true if the diagnosis should be generated, false if they should be omitted.
          * @param maxAffectedResourcesCount the max number of affected resources to be returned as part of the diagnosis
          * @return The diagnoses list the indicator identified. Alternatively, an empty list if none were found or verbose is false.
          */
@@ -1243,23 +1244,6 @@ static List<Diagnosis.Resource> getRestoreFromSnapshotAffectedResources(
                 }
             }
 
-            Map<String, Set<ProjectIndexName>> featureToDsBackingIndices = getSystemDsBackingIndicesForProjects(
-                systemIndices,
-                affectedProjects,
-                metadata
-            );
-
-            // the shards_availability indicator works with indices so let's remove the feature states data streams backing indices from
-            // the list of affected indices (the feature state will cover the restore of these indices too)
-            for (Map.Entry<String, Set<ProjectIndexName>> featureToBackingIndices : featureToDsBackingIndices.entrySet()) {
-                for (ProjectIndexName featureIndex : featureToBackingIndices.getValue()) {
-                    if (restoreFromSnapshotIndices.contains(featureIndex)) {
-                        affectedFeatureStates.add(featureToBackingIndices.getKey());
-                        affectedIndices.remove(featureIndex);
-                    }
-                }
-            }
-
             if (affectedIndices.isEmpty() == false) {
                 affectedResources.add(
                     new Diagnosis.Resource(
@@ -1281,7 +1265,7 @@ static List<Diagnosis.Resource> getRestoreFromSnapshotAffectedResources(
         }
 
         /**
-         * Retrieve the system indices for the projects and group them by Feature
+         * Retrieve the system indices and indices backing system data streams for the projects and group them by Feature
          */
         private static Map<String, Set<ProjectIndexName>> getSystemIndicesForProjects(
             SystemIndices systemIndices,
@@ -1293,7 +1277,7 @@ private static Map<String, Set<ProjectIndexName>> getSystemIndicesForProjects(
                 .collect(
                     Collectors.toMap(
                         SystemIndices.Feature::getName,
-                        feature -> feature.getIndexDescriptors()
+                        feature -> feature.getSystemResourceDescriptors()
                             .stream()
                             .flatMap(
                                 descriptor -> projects.stream()
@@ -1307,34 +1291,6 @@ private static Map<String, Set<ProjectIndexName>> getSystemIndicesForProjects(
                     )
                 );
         }
-
-        /**
-         * Retrieve the backing indices for system data stream for the projects and group them by Feature
-         */
-        private static Map<String, Set<ProjectIndexName>> getSystemDsBackingIndicesForProjects(
-            SystemIndices systemIndices,
-            Set<ProjectId> projects,
-            Metadata metadata
-        ) {
-            return systemIndices.getFeatures()
-                .stream()
-                .collect(
-                    toMap(
-                        SystemIndices.Feature::getName,
-                        feature -> feature.getDataStreamDescriptors()
-                            .stream()
-                            .flatMap(
-                                descriptor -> projects.stream()
-                                    .flatMap(
-                                        projectId -> descriptor.getBackingIndexNames(metadata.getProject(projectId))
-                                            .stream()
-                                            .map(index -> new ProjectIndexName(projectId, index))
-                                    )
-                            )
-                            .collect(Collectors.toSet())
-                    )
-                );
-        }
     }
 
     public static class SearchableSnapshotsState {

x-pack/plugin/migrate/src/main/java/org/elasticsearch/system_indices/task/SystemDataStreamMigrationInfo.java

@@ -9,6 +9,7 @@
 
 import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.indices.SystemDataStreamDescriptor;
 import org.elasticsearch.indices.SystemIndices;
 

x-pack/plugin/migrate/src/main/java/org/elasticsearch/system_indices/task/SystemIndexMigrationInfo.java

@@ -14,6 +14,7 @@
 import org.elasticsearch.client.internal.OriginSettingClient;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.settings.IndexScopedSettings;
 import org.elasticsearch.common.settings.Setting;

x-pack/plugin/migrate/src/main/java/org/elasticsearch/system_indices/task/SystemIndexMigrator.java

@@ -119,6 +119,7 @@ public SystemIndexMigrator(
 
     public void run(SystemIndexMigrationTaskState taskState) {
         ClusterState clusterState = clusterService.state();
+        ProjectMetadata projectMetadata = clusterState.metadata().getProject();
 
         final String stateIndexName;
         final String stateFeatureName;
@@ -138,7 +139,7 @@ public void run(SystemIndexMigrationTaskState taskState) {
                 return;
             }
 
-            if (stateIndexName != null && clusterState.metadata().getProject().hasIndexAbstraction(stateIndexName) == false) {
+            if (stateIndexName != null && projectMetadata.hasIndexAbstraction(stateIndexName) == false) {
                 markAsFailed(new IndexNotFoundException(stateIndexName, "cannot migrate because that index does not exist"));
                 return;
             }
@@ -156,8 +157,8 @@ public void run(SystemIndexMigrationTaskState taskState) {
 
             systemIndices.getFeatures()
                 .stream()
-                .flatMap(feature -> SystemResourceMigrationFactory.fromFeature(feature, clusterState.metadata(), indexScopedSettings))
-                .filter(migrationInfo -> needToBeMigrated(migrationInfo.getIndices(clusterState.metadata().getProject())))
+                .flatMap(feature -> SystemResourceMigrationFactory.fromFeature(feature, projectMetadata, indexScopedSettings))
+                .filter(migrationInfo -> needToBeMigrated(migrationInfo.getIndices(projectMetadata)))
                 .sorted() // Stable order between nodes
                 .collect(Collectors.toCollection(() -> migrationQueue));
 
@@ -190,7 +191,7 @@ public void run(SystemIndexMigrationTaskState taskState) {
                         + nextMigrationInfo.getFeatureName()
                         + "] of locally computed queue, see logs";
                 if (nextMigrationInfo.getCurrentResourceName().equals(stateIndexName) == false) {
-                    if (clusterState.metadata().getProject().hasIndexAbstraction(stateIndexName) == false) {
+                    if (projectMetadata.hasIndexAbstraction(stateIndexName) == false) {
                         // If we don't have that index at all, and also don't have the next one
                         markAsFailed(
                             new IllegalStateException(

x-pack/plugin/migrate/src/main/java/org/elasticsearch/system_indices/task/SystemResourceMigrationFactory.java

@@ -8,7 +8,7 @@
 package org.elasticsearch.system_indices.task;
 
 import org.elasticsearch.cluster.metadata.DataStream;
-import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.common.settings.IndexScopedSettings;
 import org.elasticsearch.indices.SystemIndices;
 
@@ -25,7 +25,7 @@ class SystemResourceMigrationFactory {
      */
     static Stream<SystemResourceMigrationInfo> fromFeature(
         SystemIndices.Feature feature,
-        Metadata metadata,
+        ProjectMetadata metadata,
         IndexScopedSettings indexScopedSettings
     ) {
         return Stream.concat(
@@ -36,7 +36,7 @@ static Stream<SystemResourceMigrationInfo> fromFeature(
 
     private static Stream<SystemIndexMigrationInfo> getSystemIndicesMigrationInfos(
         SystemIndices.Feature feature,
-        Metadata metadata,
+        ProjectMetadata metadata,
         IndexScopedSettings indexScopedSettings
     ) {
         return feature.getIndexDescriptors()
@@ -54,7 +54,7 @@ private static Stream<SystemIndexMigrationInfo> getSystemIndicesMigrationInfos(
 
     private static Stream<SystemDataStreamMigrationInfo> getSystemDataStreamsMigrationInfos(
         SystemIndices.Feature feature,
-        Metadata metadata
+        ProjectMetadata metadata
     ) {
         return feature.getDataStreamDescriptors().stream().map(descriptor -> {
             DataStream dataStream = metadata.dataStreams().get(descriptor.getDataStreamName());

x-pack/plugin/migrate/src/main/java/org/elasticsearch/system_indices/task/SystemResourceMigrationInfo.java

@@ -12,6 +12,7 @@
 import org.elasticsearch.client.internal.OriginSettingClient;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.indices.SystemIndices;
 import org.elasticsearch.plugins.SystemIndexPlugin;