starlingx/monitor-armada-app
Code Issues Proposed changes

Fix Elasticsearch readiness probe http endpoint

Browse Source 
The readiness probe endpoint was changed in the 7.6.0 chart update. This
prevents the application from being reapplied after being removed since
elasticsearch stores its state in the persistent volume, meaning that
when it is reapplied it will try and fail to achieve quorum. Changing
the readiness probe to make a local healthcheck lets it advance to the
next master pod, instead of getting stuck on the first master pod.

Story: 2007221
Task: 39491

Change-Id: I720cec5a7a50a0207669258b97497aba9c99efee
Signed-off-by: Simon Cousineau <Simon.Cousineau@windriver.com>
This commit is contained in:
Simon Cousineau 2020-04-20 14:11:46 -04:00
parent d0190a4cc1
commit 6f249ae424
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitor-helm-elastic/centos/monitor-helm-elastic.spec
View File

@ -28,6 +28,7 @@ Patch07: 0007-Add-command-and-args-parameters-to-beats-and-logstash.patch
Patch08: 0008-Add-updateStrategy-parameter-to-beats-config.patch
Patch09: 0009-Add-hostNetworking-parameter-to-logstash-config.patch
Patch10: 0010-Fix-esConfig-checksum-annotation.patch
Patch11: 0011-Fix-Elasticsearch-readiness-probe-http-endpoint.patch
BuildRequires: helm
@ -46,6 +47,7 @@ Monitor Helm elasticsearch charts
%patch08 -p1
%patch09 -p1
%patch10 -p1
%patch11 -p1
%build
# initialize helm and build the toolkit

27
monitor-helm-elastic/files/0011-Fix-Elasticsearch-readiness-probe-http-endpoint.patch Normal file
View File

@ -0,0 +1,27 @@
From 3b384c47dc7f106587d074fa539095f9b7179c17 Mon Sep 17 00:00:00 2001
From: Simon Cousineau <Simon.Cousineau@windriver.com>
Date: Mon, 20 Apr 2020 16:28:46 -0400
Subject: [PATCH 1/1] Fix Elasticsearch readiness probe http endpoint
---
elasticsearch/templates/statefulset.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml
index b4f6a98..daad8b1 100644
--- a/elasticsearch/templates/statefulset.yaml
+++ b/elasticsearch/templates/statefulset.yaml
@@ -214,8 +214,8 @@ spec:
}
if [ -f "${START_FILE}" ]; then
- echo 'Elasticsearch is already running, lets check the node is healthy and there are master nodes available'
- http "/_cluster/health?timeout=0s"
+ echo 'Elasticsearch is already running, lets check the node is healthy'
+ http "/_cluster/health?{{ .Values.clusterHealthCheckParamsBasic }}"
else
DATA_NODE=$(printenv node.data)
if [[ "$DATA_NODE" == true ]]; then
--
2.20.1