Properly fix tests

Author: nielsbauman

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java

@@ -826,13 +826,13 @@ private void invokeRollover(
                     @Override
                     public void onResponse(Collection<RolloverResponse> rolloverResponses) {
                         runAfter.run();
-                        onRolloversBulkResponse(rolloverResponses);
+                        onRolloversBulkResponse(project.id(), rolloverResponses);
                     }
 
                     @Override
                     public void onFailure(Exception e) {
                         runAfter.run();
-                        onRolloverFailure(e);
+                        onRolloverFailure(project.id(), e);
                     }
                 }
             );
@@ -857,17 +857,22 @@ public void onFailure(Exception e) {
         });
     }
 
-    void onRolloversBulkResponse(Collection<RolloverResponse> rolloverResponses) {
+    void onRolloversBulkResponse(ProjectId projectId, Collection<RolloverResponse> rolloverResponses) {
         for (RolloverResponse rolloverResponse : rolloverResponses) {
             assert rolloverResponse.isLazy() && rolloverResponse.isRolledOver() == false
-                : Strings.format("Expected rollover of the [%s] index [%s] to be lazy", getOrigin(), rolloverResponse.getOldIndex());
+                : Strings.format(
+                    "Expected rollover of the [%s] index [%s] in project [%s] to be lazy",
+                    getOrigin(),
+                    projectId,
+                    rolloverResponse.getOldIndex()
+                );
         }
     }
 
-    void onRolloverFailure(Exception e) {
-        logger.error(String.format(Locale.ROOT, "[%s] related rollover failed", getOrigin()), e);
+    void onRolloverFailure(ProjectId projectId, Exception e) {
+        logger.error(String.format(Locale.ROOT, "[%s] related rollover failed in project [%s]", getOrigin(), projectId), e);
         for (Throwable throwable : e.getSuppressed()) {
-            logger.error(String.format(Locale.ROOT, "[%s] related rollover failed", getOrigin()), throwable);
+            logger.error(String.format(Locale.ROOT, "[%s] related rollover failed in project [%s]", getOrigin(), projectId), throwable);
         }
     }
 

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryTests.java

@@ -419,14 +419,13 @@ public void testAutomaticRollover() throws Exception {
         assertCalledTimes(putIndexTemplateCounterMap, event, 1);
         assertCalledTimes(rolloverCounterMap, event, 2);
         var rolloverResponsesRef = registry.getRolloverResponses();
-        int nrOfProjects = state.metadata().projects().size();
+        var projectIds = state.metadata().projects().keySet();
         assertBusy(() -> {
-            assertThat(rolloverResponsesRef.size(), equalTo(nrOfProjects));
+            assertThat(rolloverResponsesRef.keySet(), equalTo(projectIds));
             for (var rolloverResponses : rolloverResponsesRef.values()) {
                 assertNotNull(rolloverResponses.get());
                 assertThat(rolloverResponses.get(), hasSize(2));
             }
-            ;
         });
 
         // test again, to verify that the per-index-template creation lock gets released for reuse
@@ -459,7 +458,7 @@ public void testAutomaticRollover() throws Exception {
         assertCalledTimes(rolloverCounterMap, event, 2);
         var rolloverFailureRefMap = registry.getRolloverFailure();
         assertBusy(() -> {
-            assertThat(rolloverFailureRefMap.size(), equalTo(nrOfProjects));
+            assertThat(rolloverFailureRefMap.keySet(), equalTo(projectIds));
             rolloverFailureRefMap.values().forEach(rolloverFailureRef -> {
                 assertNotNull(rolloverFailureRef.get());
                 Exception rolloverFailure = rolloverFailureRef.get();

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/template/TestRegistryWithCustomPlugin.java

@@ -15,7 +15,6 @@
 import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.tasks.Task;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.xcontent.NamedXContentRegistry;
 import org.elasticsearch.xcontent.XContentParserConfiguration;
@@ -135,8 +134,7 @@ public void setApplyRollover(boolean shouldApplyRollover) {
     }
 
     @Override
-    void onRolloversBulkResponse(Collection<RolloverResponse> rolloverResponses) {
-        final var projectId = ProjectId.fromId(threadPool.getThreadContext().getHeader(Task.X_ELASTIC_PROJECT_ID_HTTP_HEADER));
+    void onRolloversBulkResponse(ProjectId projectId, Collection<RolloverResponse> rolloverResponses) {
         this.rolloverResponses.computeIfAbsent(projectId, k -> new AtomicReference<>()).set(rolloverResponses);
     }
 
@@ -145,8 +143,7 @@ public Map<ProjectId, AtomicReference<Collection<RolloverResponse>>> getRollover
     }
 
     @Override
-    void onRolloverFailure(Exception e) {
-        final var projectId = ProjectId.fromId(threadPool.getThreadContext().getHeader(Task.X_ELASTIC_PROJECT_ID_HTTP_HEADER));
+    void onRolloverFailure(ProjectId projectId, Exception e) {
         rolloverFailure.computeIfAbsent(projectId, k -> new AtomicReference<>()).set(e);
     }