Spotless and warning for different reserved metadata warnings

Author: alexey-ivanov-es

server/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java

@@ -51,6 +51,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
@@ -262,12 +263,15 @@ private ClusterStateResponse buildResponse(final ClusterStateRequest request, fi
                 if (request.multiproject() == false) {
                     ProjectStateRegistry projectStateRegistry = ProjectStateRegistry.get(currentState);
                     if (projectStateRegistry.size() > 1) {
-                        throw new Metadata.MultiProjectPendingException("There are multiple projects " + projectStateRegistry.knownProjects());
+                        throw new Metadata.MultiProjectPendingException(
+                            "There are multiple projects " + projectStateRegistry.knownProjects()
+                        );
                     }
                     var reservedStateMetadata = new HashMap<>(currentState.metadata().reservedStateMetadata());
                     var singleProjectReservedStateMetadata = projectStateRegistry.reservedStateMetadata(projectResolver.getProjectId());
-                    singleProjectReservedStateMetadata.forEach((key, value) ->
-                        reservedStateMetadata.merge(key, value, this::mergeReservedStateMetadata));
+                    singleProjectReservedStateMetadata.forEach(
+                        (key, value) -> reservedStateMetadata.merge(key, value, this::mergeReservedStateMetadata)
+                    );
 
                     mdBuilder.put(reservedStateMetadata);
                 }
@@ -325,6 +329,13 @@ private ClusterStateResponse buildResponse(final ClusterStateRequest request, fi
     }
 
     private ReservedStateMetadata mergeReservedStateMetadata(ReservedStateMetadata metadata1, ReservedStateMetadata metadata2) {
+        if (Objects.equals(metadata1.version(), metadata2.version()) == false) {
+            logger.warn(
+                "Reserved state metadata version is different for Metadata ({}) and the only project ({})",
+                metadata2.version(),
+                metadata1.version()
+            );
+        }
         ReservedStateMetadata.Builder builder = ReservedStateMetadata.builder(metadata1.namespace())
             .version(Math.max(metadata1.version(), metadata2.version()));
 

server/src/test/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateActionTests.java

@@ -272,23 +272,25 @@ private static ClusterStateRequest buildRandomRequest(Set<String> indexNames, bo
 
     private static ClusterState buildClusterState(ProjectMetadata.Builder... projects) {
         final Metadata.Builder metadataBuilder = Metadata.builder();
-        metadataBuilder.put(ReservedStateMetadata.builder("file_settings")
-            .version(43L)
-            .putHandler(new ReservedStateHandlerMetadata("cluster_settings", Set.of("setting_1", "setting_2")))
-            .build()
+        metadataBuilder.put(
+            ReservedStateMetadata.builder("file_settings")
+                .version(43L)
+                .putHandler(new ReservedStateHandlerMetadata("cluster_settings", Set.of("setting_1", "setting_2")))
+                .build()
         );
         Arrays.stream(projects).forEach(metadataBuilder::put);
         final var metadata = metadataBuilder.build();
 
         ClusterState.Builder csBuilder = ClusterState.builder(new ClusterName(randomAlphaOfLengthBetween(4, 12)));
         ProjectStateRegistry.Builder psBuilder = ProjectStateRegistry.builder();
         for (ProjectMetadata.Builder project : projects) {
-            psBuilder
-                .putReservedStateMetadata(project.getId(), ReservedStateMetadata.builder("file_settings")
+            psBuilder.putReservedStateMetadata(
+                project.getId(),
+                ReservedStateMetadata.builder("file_settings")
                     .version(43L)
                     .putHandler(new ReservedStateHandlerMetadata("project_settings", Set.of("setting_1")))
-                    .build())
-                .putProjectSettings(project.getId(), Settings.builder().put("setting_1", randomIdentifier()).build());
+                    .build()
+            ).putProjectSettings(project.getId(), Settings.builder().put("setting_1", randomIdentifier()).build());
         }
         return csBuilder.metadata(metadata)
             .routingTable(GlobalRoutingTableTestHelper.buildRoutingTable(metadata, RoutingTable.Builder::addAsNew))