From ad20d6bb836bb7a1c6a0438c36eb90de4bb92815 Mon Sep 17 00:00:00 2001 From: David Roberts Date: Wed, 19 Dec 2018 13:06:24 +0000 Subject: [PATCH] [ML] Followup to annotations index creation (#36824) Fixes two minor problems reported after merge of #36731: 1. Name the creation method to make clear it only creates if necessary 2. Avoid multiple simultaneous in-flight creation requests --- .../core/ml/annotations/AnnotationIndex.java | 10 +++++----- .../xpack/ml/MlInitializationService.java | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/annotations/AnnotationIndex.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/annotations/AnnotationIndex.java index 29a808c74ce..843be6596c3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/annotations/AnnotationIndex.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/annotations/AnnotationIndex.java @@ -38,12 +38,12 @@ public class AnnotationIndex { public static final String INDEX_NAME = ".ml-annotations-6"; /** - * Create the .ml-annotations index with correct mappings. - * This index is read and written by the UI results views, - * so needs to exist when there might be ML results to view. + * Create the .ml-annotations index with correct mappings if it does not already + * exist. This index is read and written by the UI results views, so needs to + * exist when there might be ML results to view. */ - public static void createAnnotationsIndex(Settings settings, Client client, ClusterState state, - final ActionListener finalListener) { + public static void createAnnotationsIndexIfNecessary(Settings settings, Client client, ClusterState state, + final ActionListener finalListener) { final ActionListener createAliasListener = ActionListener.wrap(success -> { final IndicesAliasesRequest request = client.admin().indices().prepareAliases() diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlInitializationService.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlInitializationService.java index 0722d213208..326081f545c 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlInitializationService.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlInitializationService.java @@ -19,6 +19,8 @@ import org.elasticsearch.gateway.GatewayService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.xpack.core.ml.annotations.AnnotationIndex; +import java.util.concurrent.atomic.AtomicBoolean; + class MlInitializationService implements LocalNodeMasterListener, ClusterStateListener { private static final Logger logger = LogManager.getLogger(MlInitializationService.class); @@ -27,6 +29,7 @@ class MlInitializationService implements LocalNodeMasterListener, ClusterStateLi private final ThreadPool threadPool; private final ClusterService clusterService; private final Client client; + private final AtomicBoolean isIndexCreationInProgress = new AtomicBoolean(false); private volatile MlDailyMaintenanceService mlDailyMaintenanceService; @@ -55,14 +58,20 @@ class MlInitializationService implements LocalNodeMasterListener, ClusterStateLi return; } - if (event.localNodeMaster()) { - AnnotationIndex.createAnnotationsIndex(settings, client, event.state(), ActionListener.wrap( + // The atomic flag prevents multiple simultaneous attempts to create the + // index if there is a flurry of cluster state updates in quick succession + if (event.localNodeMaster() && isIndexCreationInProgress.compareAndSet(false, true)) { + AnnotationIndex.createAnnotationsIndexIfNecessary(settings, client, event.state(), ActionListener.wrap( r -> { + isIndexCreationInProgress.set(false); if (r) { logger.info("Created ML annotations index and aliases"); } }, - e -> logger.error("Error creating ML annotations index or aliases", e))); + e -> { + isIndexCreationInProgress.set(false); + logger.error("Error creating ML annotations index or aliases", e); + })); } }