aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFuss, Areli (af732p) <af732p@intl.att.com>2020-05-14 15:27:12 +0300
committerOfir Sonsino <os0695@intl.att.com>2020-05-19 10:18:08 +0300
commitcf34db936b5a65e2f29a234cce201d62fffcaec8 (patch)
tree6b267ffc2322fe58413f9698b139062c292ffb22
parent27163ab0074326216309a232ee29a835a927ded8 (diff)
sdc-backend-init does not restart on healthcheck failure
Issue-ID: SDC-3063 Change-Id: I6c4a796f42060832ee8a37a708dedda7e7e98c70 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
-rw-r--r--catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb1
-rw-r--r--catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb3
2 files changed, 3 insertions, 1 deletions
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