fixup! Test

Author: jfreden

qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/FileSettingsRoleMappingUpgradeIT.java

@@ -10,6 +10,7 @@
 package org.elasticsearch.upgrades;
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
+
 import org.elasticsearch.client.Request;
 import org.elasticsearch.core.SuppressForbidden;
 import org.elasticsearch.test.XContentTestUtils;
@@ -90,20 +91,26 @@ public void checkVersions() {
         );
     }
 
-    protected static void waitForSecurityMigrationCompletion() throws Exception {
+    private static void waitForSecurityMigrationCompletionIfIndexExists() throws Exception {
         final Request request = new Request("GET", "_cluster/state/metadata/.security-7");
         assertBusy(() -> {
             Map<String, Object> indices = new XContentTestUtils.JsonMapView(entityAsMap(client().performRequest(request))).get(
                 "metadata.indices"
             );
             assertNotNull(indices);
-            // JsonMapView doesn't support . prefixed indices (splits on .)
-            @SuppressWarnings("unchecked")
-            String responseVersion = new XContentTestUtils.JsonMapView((Map<String, Object>) indices.get(".security-7")).get(
-                "migration_version.version"
-            );
-            assertNotNull(responseVersion);
-            assertTrue(Integer.parseInt(responseVersion) >= ROLE_MAPPINGS_CLEANUP_MIGRATION_VERSION);
+            // If the security index exists, migration needs to happen. There is a bug in pre cluster state role mappings code that tries
+            // to write file based role mappings before security index manager state is recovered, this makes it look like the security
+            // index is outdated (isIndexUpToDate == false). Because we can't rely on the index being there for old versions, this check
+            // is needed.
+            if (indices.containsKey(".security-7")) {
+                // JsonMapView doesn't support . prefixed indices (splits on .)
+                @SuppressWarnings("unchecked")
+                String responseVersion = new XContentTestUtils.JsonMapView((Map<String, Object>) indices.get(".security-7")).get(
+                    "migration_version.version"
+                );
+                assertNotNull(responseVersion);
+                assertTrue(Integer.parseInt(responseVersion) >= ROLE_MAPPINGS_CLEANUP_MIGRATION_VERSION);
+            }
         });
     }
 
@@ -123,7 +130,7 @@ public void testRoleMappingsAppliedOnUpgrade() throws Exception {
             ).get("metadata.role_mappings.role_mappings");
             assertThat(clusterStateRoleMappings, is(not(nullValue())));
             assertThat(clusterStateRoleMappings.size(), equalTo(1));
-            waitForSecurityMigrationCompletion();
+            waitForSecurityMigrationCompletionIfIndexExists();
             assertThat(
                 entityAsMap(client().performRequest(new Request("GET", "/_security/role_mapping"))).keySet(),
                 contains("everyone_kibana-read-only-operator-mapping")

x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/AbstractUpgradeTestCase.java

@@ -6,8 +6,6 @@
  */
 package org.elasticsearch.upgrades;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.elasticsearch.Build;
 import org.elasticsearch.Version;
 import org.elasticsearch.client.Request;
@@ -167,8 +165,6 @@ public void setupForTests() throws Exception {
         });
     }
 
-    private static final Logger log = LogManager.getLogger(AbstractUpgradeTestCase.class);
-
     protected static void waitForSecurityMigrationCompletion(RestClient adminClient, int version) throws Exception {
         final Request request = new Request("GET", "_cluster/state/metadata/.security-7");
         assertBusy(() -> {