From 71b256612f2e35b1f18831f7c3ee6dee5e48eae7 Mon Sep 17 00:00:00 2001 From: Dimitris Athanasiou Date: Wed, 12 Feb 2020 15:05:54 +0200 Subject: [PATCH] Stop trying to upgrade templates and ILM policies after success After #51456 `IndexTemplateRegistry` is updating tempaltes and ILM policies if necessary. However, even if the upgrade succeeds we keep trying. This commit fixes the issue by setting the `creationCheck` on success. --- .../xpack/core/template/IndexTemplateRegistry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java index 36c45334e7edd..7813100485a71 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistry.java @@ -168,7 +168,7 @@ private void putTemplate(final IndexTemplateConfig config, final AtomicBoolean c new ActionListener() { @Override public void onResponse(AcknowledgedResponse response) { - creationCheck.set(false); + creationCheck.set(true); if (response.isAcknowledged() == false) { logger.error("error adding index template [{}] for [{}], request was not acknowledged", templateName, getOrigin()); @@ -222,7 +222,7 @@ private void putPolicy(final LifecyclePolicy policy, final AtomicBoolean creatio new ActionListener() { @Override public void onResponse(PutLifecycleAction.Response response) { - creationCheck.set(false); + creationCheck.set(true); if (response.isAcknowledged() == false) { logger.error("error adding lifecycle policy [{}] for [{}], request was not acknowledged", policy.getName(), getOrigin());