From 59b28da25173e12929eded5e2267f46f2e021433 Mon Sep 17 00:00:00 2001 From: Gordon Brown Date: Tue, 23 Oct 2018 08:46:27 -0600 Subject: [PATCH] [ILM] Add null check to CopyExecutionStateStep (#34619) Adds a null check for IndexMetaData similar to those in #33455. --- .../core/indexlifecycle/CopyExecutionStateStep.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/CopyExecutionStateStep.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/CopyExecutionStateStep.java index b3bd4235fae..b8192dd7e43 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/CopyExecutionStateStep.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/CopyExecutionStateStep.java @@ -6,6 +6,8 @@ package org.elasticsearch.xpack.core.indexlifecycle; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; @@ -21,8 +23,12 @@ import static org.elasticsearch.xpack.core.indexlifecycle.LifecycleExecutionStat */ public class CopyExecutionStateStep extends ClusterStateActionStep { public static final String NAME = "copy_execution_state"; + + private static final Logger logger = LogManager.getLogger(CopyExecutionStateStep.class); + private String shrunkIndexPrefix; + public CopyExecutionStateStep(StepKey key, StepKey nextStepKey, String shrunkIndexPrefix) { super(key, nextStepKey); this.shrunkIndexPrefix = shrunkIndexPrefix; @@ -35,6 +41,11 @@ public class CopyExecutionStateStep extends ClusterStateActionStep { @Override public ClusterState performAction(Index index, ClusterState clusterState) { IndexMetaData indexMetaData = clusterState.metaData().index(index); + if (indexMetaData == null) { + // Index must have been since deleted, ignore it + logger.debug("[{}] lifecycle action for index [{}] executed but index no longer exists", getKey().getAction(), index.getName()); + return clusterState; + } // get source index String indexName = indexMetaData.getIndex().getName(); // get target shrink index