Feedback

Author: nielsbauman

server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java

@@ -2593,7 +2593,7 @@ private void markRepoCorrupted(long corruptedGeneration, Exception originalExcep
             new ClusterStateUpdateTask() {
                 @Override
                 public ClusterState execute(ClusterState currentState) {
-                    final var project = currentState.metadata().getProject();
+                    final var project = currentState.metadata().getDefaultProject();
                     final RepositoriesMetadata state = RepositoriesMetadata.get(project);
                     final RepositoryMetadata repoState = state.repository(metadata.name());
                     if (repoState.generation() != corruptedGeneration) {
@@ -2787,13 +2787,17 @@ public ClusterState execute(ClusterState currentState) {
                         + "] must be larger than latest known generation ["
                         + latestKnownRepoGen.get()
                         + "]";
-                final var project = currentState.metadata().getProject();
-                final var updatedRepositoriesMetadata = RepositoriesMetadata.get(project)
-                    .withUpdatedGeneration(repoName, safeGeneration, newGen);
-                return currentState.copyAndUpdateProject(
-                    project.id(),
-                    builder -> builder.putCustom(RepositoriesMetadata.TYPE, updatedRepositoriesMetadata)
-                );
+                final var project = currentState.metadata().getDefaultProject();
+                return ClusterState.builder(currentState)
+                    .putProjectMetadata(
+                        ProjectMetadata.builder(project)
+                            .putCustom(
+                                RepositoriesMetadata.TYPE,
+                                RepositoriesMetadata.get(project).withUpdatedGeneration(repoName, safeGeneration, newGen)
+                            )
+                            .build()
+                    )
+                    .build();
             }
 
             @Override

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java

@@ -958,10 +958,11 @@ static Function<ClusterState, ClusterState> cleanFollowedRemoteIndices(
                         autoFollowPatternNameToFollowedIndexUUIDs,
                         currentAutoFollowMetadata.getHeaders()
                     );
-                    return currentState.copyAndUpdateProject(
-                        currentProject.id(),
-                        builder -> builder.putCustom(AutoFollowMetadata.TYPE, newAutoFollowMetadata)
-                    );
+                    return ClusterState.builder(currentState)
+                        .putProjectMetadata(
+                            ProjectMetadata.builder(currentProject).putCustom(AutoFollowMetadata.TYPE, newAutoFollowMetadata).build()
+                        )
+                        .build();
                 } else {
                     return currentState;
                 }

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/persistence/TrainedModelCacheMetadataService.java

@@ -17,6 +17,7 @@
 import org.elasticsearch.cluster.ClusterStateTaskExecutor;
 import org.elasticsearch.cluster.ClusterStateTaskExecutor.TaskContext;
 import org.elasticsearch.cluster.ClusterStateTaskListener;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.cluster.service.MasterServiceTaskQueue;
 import org.elasticsearch.common.Priority;
@@ -122,11 +123,12 @@ public ClusterState execute(BatchExecutionContext<CacheMetadataUpdateTask> batch
                 return initialState;
             }
 
-            final var finalMetadata = currentCacheMetadata;
-            return initialState.copyAndUpdateProject(
-                initialState.metadata().getProject().id(),
-                builder -> builder.putCustom(TrainedModelCacheMetadata.NAME, finalMetadata)
-            );
+            return ClusterState.builder(initialState)
+                .putProjectMetadata(
+                    ProjectMetadata.builder(initialState.metadata().getProject())
+                        .putCustom(TrainedModelCacheMetadata.NAME, currentCacheMetadata)
+                )
+                .build();
         }
     }
 }