Commit a863041a authored by Rafael Monnerat's avatar Rafael Monnerat

apache-frontend: include apache-mpm-watchdog

  Apache MPM Watchdog promise was introduced to search apache on
  deadlock state after a graceful reload and kill them after 600s.

  This change prevents the apache lack of nodes after several processes
  get stalled on deadlock.
parent 930f66d6
...@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e ...@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
[template-apache-frontend] [template-apache-frontend]
filename = instance-apache-frontend.cfg filename = instance-apache-frontend.cfg
md5sum = 86f9ace5eb5ac28dbc173e1803952f03 md5sum = 465360ab5ff2c3be3c9902205cabee31
[template-apache-replicate] [template-apache-replicate]
filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
......
...@@ -23,6 +23,7 @@ parts = ...@@ -23,6 +23,7 @@ parts =
promise-apache-frontend-cached promise-apache-frontend-cached
promise-apache-frontend-ssl-cached promise-apache-frontend-ssl-cached
promise-apache-is-process-older-than-dependency-set promise-apache-is-process-older-than-dependency-set
promise-apache-mpm-watchdog
promise-nginx-frontend-v4-https promise-nginx-frontend-v4-https
promise-nginx-frontend-v4-http promise-nginx-frontend-v4-http
...@@ -44,7 +45,6 @@ parts = ...@@ -44,7 +45,6 @@ parts =
## Nginx ## Nginx
nginx-frontend nginx-frontend
## Monitor for apache ## Monitor for apache
monitor-base monitor-base
monitor-ats-cache-stats-wrapper monitor-ats-cache-stats-wrapper
...@@ -572,13 +572,18 @@ path = $${directory:promise}/apache_ssl_cached ...@@ -572,13 +572,18 @@ path = $${directory:promise}/apache_ssl_cached
hostname = $${instance-parameter:ipv4-random} hostname = $${instance-parameter:ipv4-random}
port = $${apache-configuration:ssl-cache-through-port} port = $${apache-configuration:ssl-cache-through-port}
[promise-apache-is-process-older-than-dependency-set] [promise-apache-is-process-older-than-dependency-set]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${apache-configuration:pid-file} command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${apache-configuration:pid-file}
wrapper-path = $${directory:promise}/apache-frontend-is-running-actual-software-release wrapper-path = $${directory:promise}/apache-frontend-is-running-actual-software-release
parameters-extra = true parameters-extra = true
[promise-apache-mpm-watchdog]
recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/apache-mpm-watchdog --url http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u admin -p $${monitor-htpasswd:passwd} -d $${directory:run}/apache-mpm-watchdog.json
wrapper-path = $${directory:promise}/apache-mpm-watchdog
parameters-extra = true
[slap_connection] [slap_connection]
# Kept for backward compatiblity # Kept for backward compatiblity
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment