From cf34db936b5a65e2f29a234cce201d62fffcaec8 Mon Sep 17 00:00:00 2001 From: "Fuss, Areli (af732p)" Date: Thu, 14 May 2020 15:27:12 +0300 Subject: sdc-backend-init does not restart on healthcheck failure Issue-ID: SDC-3063 Change-Id: I6c4a796f42060832ee8a37a708dedda7e7e98c70 Signed-off-by: Ofir Sonsino --- .../cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb | 1 + .../sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb index 0a551f2a52..cd36fbd26b 100644 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb +++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb @@ -23,4 +23,5 @@ bash "executing-check_Backend_Health" do rc=$? if [[ $rc != 0 ]]; then exit $rc; fi EOH + returns [0] end \ No newline at end of file diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb index eb77f93c33..bcacf888ed 100644 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb +++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb @@ -3,6 +3,7 @@ import subprocess #from time import sleep import time from datetime import datetime +import sys beStat=0 BE_IP="<%= @be_ip %>" @@ -48,4 +49,4 @@ for i in range(1,10): if beStat == 0: print '[ERROR]: ' + time.strftime('%Y/%m/%d %H:%M:%S') + bcolors.FAIL + 'Backend is DOWN :-(' + bcolors.ENDC - exit() \ No newline at end of file + sys.exit(1) \ No newline at end of file -- cgit 1.2.3-korg