summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuli Shlosberg <ys9693@att.com>2018-02-27 10:38:48 +0200
committerYuli Shlosberg <ys9693@att.com>2018-02-27 10:39:13 +0200
commitc120666439c6eee238e31a01ee9de91d1fa821f8 (patch)
treea904c794b42779ad2f292eb82f9e774adddfffd2
parente74faa5a396139e34678ff73f60c6038201ca409 (diff)
ES OOM alignment
Change-Id: I2f9321dcd9603cbb38d840efe9dc46fb0772e785 Issue-ID: SDC-915 Signed-off-by: Yuli Shlosberg <ys9693@att.com>
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb2
-rw-r--r--sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb7
-rw-r--r--sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb2
-rw-r--r--sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_3_prepareProbeFile.rb5
-rw-r--r--sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/templates/default/ready-probe.sh.erb8
-rw-r--r--sdc-os-chef/sdc-elasticsearch/chef-solo/roles/elasticsearch.json3
6 files changed, 15 insertions, 12 deletions
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb
index 26f72664b7..4d8540e956 100644
--- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb
+++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb
@@ -1,7 +1,5 @@
#!/bin/bash
-set -x
-
health_Check_http_code=$(curl --max-time 5 -o /dev/null -w '%{http_code}' http://127.0.0.1:8080/sdc2/rest/healthCheck)
if [[ "$health_Check_http_code" -eq 500 ]]; then
exit 200
diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb
index 3d722021da..c196ca7b94 100644
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb
@@ -14,11 +14,4 @@ template "/var/lib/ready-probe.sh" do
:cassandra_ip => application_host,
:cassandra_pwd => ENV['CS_PASSWORD']
})
-end
-
-
-bash "run_probe_script" do
- code <<-EOH
- /var/lib/ready-probe.sh
- EOH
end \ No newline at end of file
diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb
index 25dfbf66a6..2f97d0768e 100644
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/ready-probe.sh.erb
@@ -1,7 +1,5 @@
#!/bin/bash
-set -x
-
CASSANDRA_PASS=<%= @cassandra_pwd %>
CASSANDRA_IP=<%= @cassandra_ip %>
diff --git a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_3_prepareProbeFile.rb b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_3_prepareProbeFile.rb
new file mode 100644
index 0000000000..14d08be94c
--- /dev/null
+++ b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/recipes/ES_3_prepareProbeFile.rb
@@ -0,0 +1,5 @@
+template "/var/lib/ready-probe.sh" do
+ source "ready-probe.sh.erb"
+ sensitive true
+ mode 0755
+end \ No newline at end of file
diff --git a/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/templates/default/ready-probe.sh.erb b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/templates/default/ready-probe.sh.erb
new file mode 100644
index 0000000000..66b07873e5
--- /dev/null
+++ b/sdc-os-chef/sdc-elasticsearch/chef-repo/cookbooks/sdc-elasticsearch/templates/default/ready-probe.sh.erb
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+health_Check_http_code=$(curl -o /dev/null -w '%{http_code}' http://127.0.0.1:9200/_cluster/health?wait_for_status=yellow&timeout=120s)
+if [[ "$health_Check_http_code" -eq 200 ]]; then
+ exit 200
+else
+ exit $health_Check_http_code
+fi
diff --git a/sdc-os-chef/sdc-elasticsearch/chef-solo/roles/elasticsearch.json b/sdc-os-chef/sdc-elasticsearch/chef-solo/roles/elasticsearch.json
index 239c1cd04b..8e11b2246e 100644
--- a/sdc-os-chef/sdc-elasticsearch/chef-solo/roles/elasticsearch.json
+++ b/sdc-os-chef/sdc-elasticsearch/chef-solo/roles/elasticsearch.json
@@ -11,7 +11,8 @@
"chef_type": "role",
"run_list": [
"recipe[sdc-elasticsearch::ES_1_setup_elasticsearch]",
- "recipe[sdc-elasticsearch::ES_2_setup_logging]"
+ "recipe[sdc-elasticsearch::ES_2_setup_logging]",
+ "recipe[sdc-elasticsearch::ES_3_prepareProbeFile]"
],
"env_run_lists": {
}