Commit b1a6c8e6 authored by Vincent Pelletier's avatar Vincent Pelletier

erp5: Use the same default value for thread amount as Zope's.

One thread is just too limited to produce a usable instance (for example,
a single-zope setup with default thread count fails to run live tests). It
is also not an advised setting for activity nodes, because of timerserver
still queuing process_timer calls while CMFActivity is busy processing; the
result being a (limited) waste of memory, and hammering mysql after long
processing periods.
Zope's default value must be duplicated because thread-amount is also used
to generate haproxy configuration file (so just not providing the value in
Zope's configuration file is wrong).
parent da9c30c8
...@@ -296,7 +296,7 @@ extra-context = ...@@ -296,7 +296,7 @@ extra-context =
[template-erp5] [template-erp5]
< = download-base < = download-base
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 1c27513d03c5dbb7c12f71386bc97ef7 md5sum = 535e8089acf808efe1d4e55328404ce3
[template-zeo] [template-zeo]
< = download-base < = download-base
......
...@@ -126,7 +126,7 @@ name = {{ partition_name }} ...@@ -126,7 +126,7 @@ name = {{ partition_name }}
{{ sla(partition_name) }} {{ sla(partition_name) }}
config-name = {{ dumps(custom_name) }} config-name = {{ dumps(custom_name) }}
config-instance-count = {{ dumps(zope_parameter_dict.get('instance-count', 1)) }} config-instance-count = {{ dumps(zope_parameter_dict.get('instance-count', 1)) }}
config-thread-amount = {{ dumps(zope_parameter_dict.get('thread-amount', 1)) }} config-thread-amount = {{ dumps(zope_parameter_dict.get('thread-amount', 4)) }}
config-timerserver-interval = {{ dumps(zope_parameter_dict.get('timerserver-interval', 5)) }} config-timerserver-interval = {{ dumps(zope_parameter_dict.get('timerserver-interval', 5)) }}
config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longrequest-logger-interval', -1)) }} config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longrequest-logger-interval', -1)) }}
config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longrequest-logger-timeout', 1)) }} config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longrequest-logger-timeout', 1)) }}
......
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