Fixing IndexTemplateRegistryTests race condition (elastic#103999) (el…

…astic#104572)
tvernum · Jan 19, 2024 · dca4b08 · dca4b08
1 parent fbb8557
commit dca4b08
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.../core/src/test/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryTests.java b/.../core/src/test/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryTests.java
@@ -396,15 +396,16 @@ public void testAutomaticRollover() throws Exception {
         assertBusy(() -> assertThat(rolloverCounter.get(), equalTo(2)));
         AtomicReference<Collection<RolloverResponse>> rolloverResponsesRef = registry.getRolloverResponses();
         assertBusy(() -> assertNotNull(rolloverResponsesRef.get()));
-        Collection<RolloverResponse> rolloverResponses = rolloverResponsesRef.get();
-        assertThat(rolloverResponses, hasSize(2));
+        assertThat(rolloverResponsesRef.get(), hasSize(2));
 
         // test again, to verify that the per-index-template creation lock gets released for reuse
         putIndexTemplateCounter.set(0);
         rolloverCounter.set(0);
+        rolloverResponsesRef.set(Collections.emptySet());
         registry.clusterChanged(event);
         assertBusy(() -> assertThat(putIndexTemplateCounter.get(), equalTo(1)));
         assertBusy(() -> assertThat(rolloverCounter.get(), equalTo(2)));
+        assertBusy(() -> assertThat(rolloverResponsesRef.get(), hasSize(2)));
 
         // test rollover failures
         putIndexTemplateCounter.set(0);