fixup!

Author: jfreden

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityIndexManager.java

@@ -290,7 +290,7 @@ public void clusterChanged(ClusterChangedEvent event) {
         final Set<String> reservedStateRoleMappingNames = ReservedRoleMappingAction.getFileSettingsMetadataHandlerRoleMappingKeys(
             event.state()
         );
-        final boolean clusterStateRoleMappingsSynced = reservedStateRoleMappingNames.size() == RoleMappingMetadata.getFromClusterState(
+        final boolean reservedRoleMappingsSynced = reservedStateRoleMappingNames.size() == RoleMappingMetadata.getFromClusterState(
             event.state()
         ).getRoleMappings().size();
         final boolean mappingIsUpToDate = indexMetadata == null || checkIndexMappingUpToDate(event.state());
@@ -323,7 +323,7 @@ public void clusterChanged(ClusterChangedEvent event) {
             indexAvailableForWrite,
             mappingIsUpToDate,
             createdOnLatestVersion,
-            clusterStateRoleMappingsSynced,
+            reservedRoleMappingsSynced,
             migrationsVersion,
             minClusterMappingVersion,
             indexMappingVersion,
@@ -704,7 +704,7 @@ public static class State {
         public final boolean indexAvailableForWrite;
         public final boolean mappingUpToDate;
         public final boolean createdOnLatestVersion;
-        public final boolean clusterStateRoleMappingsSynced;
+        public final boolean reservedRoleMappingsSynced;
         public final Integer migrationsVersion;
         // Min mapping version supported by the descriptors in the cluster
         public final SystemIndexDescriptor.MappingsVersion minClusterMappingVersion;
@@ -724,7 +724,7 @@ public State(
             boolean indexAvailableForWrite,
             boolean mappingUpToDate,
             boolean createdOnLatestVersion,
-            boolean clusterStateRoleMappingsSynced,
+            boolean reservedRoleMappingsSynced,
             Integer migrationsVersion,
             SystemIndexDescriptor.MappingsVersion minClusterMappingVersion,
             Integer indexMappingVersion,
@@ -742,7 +742,7 @@ public State(
             this.mappingUpToDate = mappingUpToDate;
             this.migrationsVersion = migrationsVersion;
             this.createdOnLatestVersion = createdOnLatestVersion;
-            this.clusterStateRoleMappingsSynced = clusterStateRoleMappingsSynced;
+            this.reservedRoleMappingsSynced = reservedRoleMappingsSynced;
             this.minClusterMappingVersion = minClusterMappingVersion;
             this.indexMappingVersion = indexMappingVersion;
             this.concreteIndexName = concreteIndexName;
@@ -764,7 +764,7 @@ public boolean equals(Object o) {
                 && indexAvailableForWrite == state.indexAvailableForWrite
                 && mappingUpToDate == state.mappingUpToDate
                 && createdOnLatestVersion == state.createdOnLatestVersion
-                && clusterStateRoleMappingsSynced == state.clusterStateRoleMappingsSynced
+                && reservedRoleMappingsSynced == state.reservedRoleMappingsSynced
                 && Objects.equals(indexMappingVersion, state.indexMappingVersion)
                 && Objects.equals(migrationsVersion, state.migrationsVersion)
                 && Objects.equals(minClusterMappingVersion, state.minClusterMappingVersion)
@@ -788,7 +788,7 @@ public int hashCode() {
                 indexAvailableForWrite,
                 mappingUpToDate,
                 createdOnLatestVersion,
-                clusterStateRoleMappingsSynced,
+                reservedRoleMappingsSynced,
                 migrationsVersion,
                 minClusterMappingVersion,
                 indexMappingVersion,
@@ -814,8 +814,8 @@ public String toString() {
                 + mappingUpToDate
                 + ", createdOnLatestVersion="
                 + createdOnLatestVersion
-                + ", clusterStateRoleMappingsSynced="
-                + clusterStateRoleMappingsSynced
+                + ", reservedRoleMappingsSynced="
+                + reservedRoleMappingsSynced
                 + ", migrationsVersion="
                 + migrationsVersion
                 + ", minClusterMappingVersion="

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/support/SecurityMigrations.java

@@ -64,6 +64,12 @@ public interface SecurityMigration {
          */
         Set<NodeFeature> nodeFeaturesRequired();
 
+        /**
+         * Check that any pre-conditions are met before launching migration
+         *
+         * @param securityIndexManagerState current state of the security index
+         * @return true if pre-conditions met, otherwise false
+         */
         default boolean checkPreConditions(SecurityIndexManager.State securityIndexManagerState) {
             return true;
         }
@@ -145,7 +151,7 @@ public void migrate(SecurityIndexManager securityIndexManager, Client client, Ac
                 }
 
                 getNativeRoleMappings(client, ActionListener.wrap(roleMappings -> {
-                    logger.info("Found [" + roleMappings.size() + "] to cleanup in .security index.");
+                    logger.info("Found [" + roleMappings.size() + "] role mappings to cleanup in .security index.");
                     deleteNativeRoleMappings(client, roleMappings.iterator(), listener);
                 }, listener::onFailure), clusterStateRoleMappingNames.toArray(String[]::new));
             }
@@ -173,6 +179,8 @@ private void deleteNativeRoleMappings(Client client, Iterator<String> namesItera
                     ActionListener.wrap(response -> {
                         if (response.isFound() == false) {
                             logger.warn("Expected role mapping [" + name + "] not found during role mapping clean up.");
+                        } else {
+                            logger.info("Deleted duplicated role mapping [" + name + "] from .security index");
                         }
                         if (namesIterator.hasNext()) {
                             deleteNativeRoleMappings(client, namesIterator, listener);
@@ -186,7 +194,7 @@ private void deleteNativeRoleMappings(Client client, Iterator<String> namesItera
             @Override
             public boolean checkPreConditions(SecurityIndexManager.State securityIndexManagerState) {
                 // If there are operator defined role mappings, make sure they've been loaded in to cluster state before launching migration
-                return securityIndexManagerState.clusterStateRoleMappingsSynced;
+                return securityIndexManagerState.reservedRoleMappingsSynced;
             }
 
             @Override