Commit 58c43711 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge remote-tracking branch 'origin/master' into erp5-component

parents b199e93f 19536d96
...@@ -31,9 +31,10 @@ configure-options = ...@@ -31,9 +31,10 @@ configure-options =
--with-ncurses=${ncurses:location} --with-ncurses=${ncurses:location}
--with-tcl=${tcl:location}/lib/ --with-tcl=${tcl:location}/lib/
--with-zlib=${zlib:location} --with-zlib=${zlib:location}
--enable-experimental-plugins
environment = environment =
PATH=${make:location}/bin:${libtool:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${make:location}/bin:${libtool:location}/bin:${pkgconfig:location}/bin:%(PATH)s
LDFLAGS = -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib LDFLAGS = -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -Wl,-rpath=${openssl:location}/lib
make-target = make-target =
check check
install install
...@@ -20,16 +20,20 @@ Apache frontend is available in 3 software types: ...@@ -20,16 +20,20 @@ Apache frontend is available in 3 software types:
About replicate frontend About replicate frontend
======================== ========================
Slaves of the root instance (type "replicate") are sent as a parameter to requested frontends which will process them. The only difference is that they will then return the « would-be published information » to the root instance instead of publishing it. The root instance will then do a synthesis and publish the information to its slaves. The replicate instance only use 3 type of parameters for itself and will transmit the rest to requested frontends. Slaves of the root instance (type "replicate") are sent as a parameter to requested frontends which will process them. The only difference is that they will then return the « would-be published information » to the root instance instead of publishing it. The root instance will then do a synthesis and publish the information to its slaves. The replicate instance only use 5 type of parameters for itself and will transmit the rest to requested frontends.
These parameters are : These parameters are :
* "-frontend-type" : the type to deploy frontends with. (default to 2) * "-frontend-type" : the type to deploy frontends with. (default to 2)
* "-frontend-quantity" : The quantity of frontends to request (default to "default") * "-frontend-quantity" : The quantity of frontends to request (default to "default")
* "-frontend-i-state": The state of frontend i
* "-frontend-software-release-url": Software release to be used for frontends, default to the current software release
* "-sla-i-foo" : where "i" is the number of the concerned frontend (between 1 and "-frontend-quantity") and "foo" a sla parameter. * "-sla-i-foo" : where "i" is the number of the concerned frontend (between 1 and "-frontend-quantity") and "foo" a sla parameter.
ex: ex:
<parameter id="-frontend-quantity">3</parameter> <parameter id="-frontend-quantity">3</parameter>
<parameter id="-frontend-type">custom-personal</parameter> <parameter id="-frontend-type">custom-personal</parameter>
<parameter id="-frontend-2-state">stopped</parameter>
<parameter id="-sla-3-computer_guid">COMP-1234</parameter> <parameter id="-sla-3-computer_guid">COMP-1234</parameter>
will request the third frontend on COMP-1234. All frontends will be of software type "custom-personal". <parameter id="-frontend-software-release-url">http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.183:/software/apache-frontend/software.cfg</parameter>
will request the third frontend on COMP-1234. All frontends will be of software type "custom-personal". The second frontend will be requested with the state stopped
Note: the way slaves are transformed to a parameter avoid modifying more than 3 lines in the frontend logic. Note: the way slaves are transformed to a parameter avoid modifying more than 3 lines in the frontend logic.
Important NOTE: The way you ask for slave to a replicate frontend is the same as the one you would use for the software given in "-frontend-quantity". Do not forget to use "replicate" for software type. XXXXX So far it is not possible to do a simple request on a replicate frontend if you do not know the software_guid or other sla-parameter of the master instance. In fact we do not know yet the software type of the "requested" frontends. TO BE IMPLEMENTED Important NOTE: The way you ask for slave to a replicate frontend is the same as the one you would use for the software given in "-frontend-quantity". Do not forget to use "replicate" for software type. XXXXX So far it is not possible to do a simple request on a replicate frontend if you do not know the software_guid or other sla-parameter of the master instance. In fact we do not know yet the software type of the "requested" frontends. TO BE IMPLEMENTED
......
...@@ -67,14 +67,14 @@ mode = 0644 ...@@ -67,14 +67,14 @@ mode = 0644
[template-apache-frontend] [template-apache-frontend]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apache-frontend.cfg url = ${:_profile_base_location_}/instance-apache-frontend.cfg
md5sum = 070275aa2b2941702cc9ec637fe778e1 md5sum = 05216295ad8ab5ebf34644ac253f0db6
output = ${buildout:directory}/template-apache-frontend.cfg output = ${buildout:directory}/template-apache-frontend.cfg
mode = 0644 mode = 0644
[template-apache-replicate] [template-apache-replicate]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
md5sum = 82c88a4b4856bfffec3d7ef24e372f38 md5sum = 5de85259870dc4364954018041561882
mode = 0644 mode = 0644
[template-slave-list] [template-slave-list]
...@@ -92,7 +92,7 @@ mode = 640 ...@@ -92,7 +92,7 @@ mode = 640
[template-replicate-publish-slave-information] [template-replicate-publish-slave-information]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/templates/replicate-publish-slave-information.cfg.in url = ${:_profile_base_location_}/templates/replicate-publish-slave-information.cfg.in
md5sum = a2cf00b24877bf747e2408d444f16f05 md5sum = 665e83d660c9b779249b2179d7ce4b4e
mode = 640 mode = 640
[template-apache-frontend-configuration] [template-apache-frontend-configuration]
......
...@@ -29,7 +29,9 @@ parts = ...@@ -29,7 +29,9 @@ parts =
trafficserver-configuration-directory trafficserver-configuration-directory
trafficserver-records-config trafficserver-records-config
trafficserver-remap-config trafficserver-remap-config
trafficserver-plugin-config
trafficserver-storage-config trafficserver-storage-config
trafficserver-promise-listen-port
## Monitoring part ## Monitoring part
###Parts to add for monitoring ###Parts to add for monitoring
...@@ -454,6 +456,7 @@ input-port = 23432 ...@@ -454,6 +456,7 @@ input-port = 23432
hostname = $${slap-parameter:frontend-name} hostname = $${slap-parameter:frontend-name}
remap = map / http://$${instance-parameter:ipv4-random}:$${apache-configuration:cache-through-port} remap = map / http://$${instance-parameter:ipv4-random}:$${apache-configuration:cache-through-port}
disk-cache-config = $${trafficserver-directory:cache-path} 8G volume=$${slap-parameter:frontend-name} disk-cache-config = $${trafficserver-directory:cache-path} 8G volume=$${slap-parameter:frontend-name}
plugin-config = ${trafficserver:location}/libexec/trafficserver/rfc5861.so
[trafficserver-configuration-directory] [trafficserver-configuration-directory]
recipe = plone.recipe.command recipe = plone.recipe.command
...@@ -490,6 +493,14 @@ mode = 700 ...@@ -490,6 +493,14 @@ mode = 700
context = context =
key content trafficserver-variable:remap key content trafficserver-variable:remap
[trafficserver-plugin-config]
< = jinja2-template-base
template = ${template-empty:target}
rendered = $${trafficserver-configuration-directory:target}/plugin.config
mode = 700
context =
key content trafficserver-variable:plugin-config
[trafficserver-storage-config] [trafficserver-storage-config]
< = jinja2-template-base < = jinja2-template-base
template = ${template-empty:target} template = ${template-empty:target}
...@@ -498,6 +509,12 @@ mode = 700 ...@@ -498,6 +509,12 @@ mode = 700
context = context =
key content trafficserver-variable:disk-cache-config key content trafficserver-variable:disk-cache-config
[trafficserver-promise-listen-port]
recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/trafficserver-port-listening
hostname = $${trafficserver-variable:local-ip}
port = $${trafficserver-variable:input-port}
### End of ATS sections ### End of ATS sections
### Apaches Graceful and promises ### Apaches Graceful and promises
......
...@@ -49,6 +49,10 @@ context = ...@@ -49,6 +49,10 @@ context =
[{{request_section_title}}] [{{request_section_title}}]
<= replicate <= replicate
name = {{frontend_name}} name = {{frontend_name}}
{% set state_key = "-frontend-%s-state" % i %}
{% if slapparameter_dict.has_key(state_key) %}
state = {{ slapparameter_dict.pop(state_key) }}
{% endif%}
{% if sla_parameters %} {% if sla_parameters %}
sla = {{ ' '.join(sla_parameters) }} sla = {{ ' '.join(sla_parameters) }}
{% for parameter in sla_parameters -%} {% for parameter in sla_parameters -%}
...@@ -60,7 +64,12 @@ sla-{{ parameter }} = {{ slapparameter_dict.pop( sla_key + parameter ) }} ...@@ -60,7 +64,12 @@ sla-{{ parameter }} = {{ slapparameter_dict.pop( sla_key + parameter ) }}
[replicate] [replicate]
<= slap-connection <= slap-connection
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
{% set frontend_software_url_key = "-frontend-software-release-url" %}
{% if slapparameter_dict.has_key(frontend_software_url_key) %}
software-url = {{ slapparameter_dict.pop(frontend_software_url_key) }}
{% else %}
software-url = ${slap-connection:software-release-url} software-url = ${slap-connection:software-release-url}
{% endif %}
software-type = {{frontend_type}} software-type = {{frontend_type}}
return = private-ipv4 public-ipv4 slave-instance-information-list monitor_url return = private-ipv4 public-ipv4 slave-instance-information-list monitor_url
config = {{ ' '.join(slapparameter_dict.keys()) + ' ' + slave_list_name }} config = {{ ' '.join(slapparameter_dict.keys()) + ' ' + slave_list_name }}
......
...@@ -3,7 +3,11 @@ ...@@ -3,7 +3,11 @@
# regroup slave information from all frontends # regroup slave information from all frontends
{%- for frontend, slave_list_raw in slave_information.iteritems() -%} {%- for frontend, slave_list_raw in slave_information.iteritems() -%}
{% if slave_list_raw %}
{% set slave_list = json_module.loads(slave_list_raw) -%} {% set slave_list = json_module.loads(slave_list_raw) -%}
{% else %}
{% set slave_list = [] %}
{% endif %}
{% for slave_dict in slave_list -%} {% for slave_dict in slave_list -%}
{% set slave_reference = slave_dict.pop('slave-reference') %} {% set slave_reference = slave_dict.pop('slave-reference') %}
{% set log_access_url = slave_dict.pop('log-access', '') %} {% set log_access_url = slave_dict.pop('log-access', '') %}
......
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