Merge pull request #1786 from jcantrill/1748478_deux

Bug 1748478: Add more states to init probe
openshift · Nov 14, 2019 · c1dfa00 · c1dfa00
2 parents c9147d0 + 16c4c00
commit c1dfa00
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/elasticsearch/init.sh b/elasticsearch/init.sh
@@ -20,6 +20,7 @@ source "logging"
 wait_for_port_open
 failed=0
 
+touch ${HOME}/init_running
 pushd "${ES_HOME}/init"
   files=$(ls --hide common | sort)
   for init_file in ${files}; do
@@ -29,6 +30,7 @@ pushd "${ES_HOME}/init"
   done
 popd
 
+rm -f ${HOME}/init_running
 if [ $failed -eq 0 ]; then
   touch ${HOME}/init_complete
 fi
diff --git a/elasticsearch/probe/readiness.sh b/elasticsearch/probe/readiness.sh
@@ -42,9 +42,22 @@ function check_if_ready() {
   fi
 }
 
+function check_for_init_running() {
+  test -f ${HOME}/init_running
+}
+
 function check_for_init_complete() {
   test -f ${HOME}/init_complete
 }
 
+function show_failures() {
+  if [ -f ${HOME}/init_failures ]; then
+    cat ${HOME}/init_failures
+  else
+    # this should never happen"
+    echo "Elasticsearch node is in unknown state"
+  fi
+}
+
 check_if_ready "/" "Elasticsearch node is not ready to accept HTTP requests yet"
-check_for_init_complete || cat ${HOME}/init_failures
+check_for_init_complete || ( check_for_init_running && echo "Elasticsearch node is initializing" ) || show_failures