Code review suggestion

elastic#116219 (comment)
axw · Nov 5, 2024 · 0cff8db · 0cff8db
1 parent 89455be
commit 0cff8db
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...lugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java b/...lugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java
@@ -550,7 +550,7 @@ private void putComposableTemplate(
                     public void onResponse(AcknowledgedResponse response) {
                         if (response.isAcknowledged()) {
                             if (applyRolloverAfterTemplateV2Update()) {
-                                invokeRollover(state, templateName, indexTemplate, creationCheck);
+                                invokeRollover(state, templateName, indexTemplate, () -> creationCheck.set((false)));
                             } else {
                                 creationCheck.set(false);
                             }
@@ -786,33 +786,33 @@ protected void onPutPipelineFailure(String pipelineId, Exception e) {
 
     /**
      * invokeRollover rolls over any data streams matching the index template,
-     * and then sets creationCheck to false.
+     * and then invokes runAfter.
      */
     private void invokeRollover(
         final ClusterState state,
         final String templateName,
         final ComposableIndexTemplate indexTemplate,
-        final AtomicBoolean creationCheck
+        final Runnable runAfter
     ) {
         final Executor executor = threadPool.generic();
         executor.execute(() -> {
             List<String> rolloverTargets = findRolloverTargetDataStreams(state, templateName, indexTemplate);
             if (rolloverTargets.isEmpty()) {
-                creationCheck.set(false);
+                runAfter.run();
                 return;
             }
             GroupedActionListener<RolloverResponse> groupedActionListener = new GroupedActionListener<>(
                 rolloverTargets.size(),
                 new ActionListener<>() {
                     @Override
                     public void onResponse(Collection<RolloverResponse> rolloverResponses) {
-                        creationCheck.set(false);
+                        runAfter.run();
                         onRolloversBulkResponse(rolloverResponses);
                     }
 
                     @Override
                     public void onFailure(Exception e) {
-                        creationCheck.set(false);
+                        runAfter.run();
                         onRolloverFailure(e);
                     }
                 }