software/wendelin: Set with-max-rlimit-nofile default to true

In Wendelin we mostly always want to run our zopes with the soft limit
set to the hard limit.

/reviewed-by @jerome, @jm, @rafael, @vpelletier
/reviewed-on nexedi/slapos!1465

---

This patch was already added in nexedi/slapos!1451, but
removed (by force push), due to issues discussed in nexedi/slapos!1451 (comment 193296).

software/erp5/instance-erp5-input-schema.json

@@ -105,7 +105,6 @@
     },
     "with-max-rlimit-nofile": {
       "description": "Set open file descriptors soft limit to hard limit",
-      "default": false,
       "type": "boolean"
     },
     "family-override": {

software/wendelin/software.cfg

@@ -25,7 +25,7 @@ eggs +=
   ${msgpack-python:egg}
   ${msgpack-numpy:egg}
   ${ipython:egg}
-  
+
 [generic_testrunner_init]
 recipe = slapos.recipe.build
 init =
@@ -49,13 +49,13 @@ initialization =
 # library to the path
 initialization +=
   ${generic_testrunner_init:initialization}
-  
+
 [testrunner]
 # we need to override the test suite runner to add our custom libstdc++ dynamic
 # library to the path
 initialization +=
   ${generic_testrunner_init:initialization}
- 
+
 [erp5_repository_list]
 repository_id_list += wendelin
 
@@ -63,8 +63,11 @@ repository_id_list += wendelin
 list += ${wendelin:location}/bt5
 
 # Jupyter is by default enabled in Wendelin
+# and also the soft limit of open file descriptors is set
+# to the hard limit.
 [erp5-defaults]
 jupyter-enable-default = true
+with-max-rlimit-nofile-enable-default = true
 
 [wendelin]
 recipe = slapos.recipe.build:gitclone

stack/erp5/buildout.cfg

@@ -185,6 +185,7 @@ context =
     key instance_common_cfg instance-common:output
     key jupyter_enable_default erp5-defaults:jupyter-enable-default
     key wcfs_enable_default erp5-defaults:wcfs-enable-default
+    key with_max_rlimit_nofile_enable_default erp5-defaults:with-max-rlimit-nofile-enable-default
     key kumo_location kumo:location
     key local_bt5_repository local-bt5-repository:list
     key logrotate_location logrotate:location
@@ -338,6 +339,8 @@ cloudooo-connection-url-list =
 jupyter-enable-default = false
 # WCFS is by default disabled in ERP5
 wcfs-enable-default = false
+# with-max-rlimit-nofile option of zopewsgi is disabled in ERP5
+with-max-rlimit-nofile-enable-default = false
 
 [erp5]
 recipe = slapos.recipe.build:gitclone

stack/erp5/buildout.hash.cfg

@@ -70,11 +70,11 @@ md5sum = b95084ae9eed95a68eada45e28ef0c04
 
 [template]
 filename = instance.cfg.in
-md5sum = 3f7b28085ceff321a3cb785db60f7c3e
+md5sum = 55232eae0bcdb68a7cb2598d2ba9d60c
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 84fb003691a7541835439c4e10be9953
+md5sum = 2bb2addc8deddff00053a065f5e2793e
 
 [template-zeo]
 filename = instance-zeo.cfg.in

stack/erp5/instance-erp5.cfg.in

@@ -11,6 +11,10 @@
 {% set jupyter_zope_family = jupyter_dict.get('zope-family', '') -%}
 {% set wcfs_dict = slapparameter_dict.get('wcfs', {}) -%}
 {% set wcfs_enable = wcfs_dict.get('enable', wcfs_enable_default.lower() in ('true', 'yes')) -%}
+{% set with_max_rlimit_nofile_enable = slapparameter_dict.get(
+    'with-max-rlimit-nofile',
+    with_max_rlimit_nofile_enable_default.lower() in ('true', 'yes'))
+%}
 {% set test_runner_enabled = slapparameter_dict.get('test-runner', {}).get('enabled', True) -%}
 {% set test_runner_node_count = slapparameter_dict.get('test-runner', {}).get('node-count', 3) -%}
 {% set test_runner_extra_database_count = slapparameter_dict.get('test-runner', {}).get('extra-database-count', 3) -%}
@@ -311,7 +315,7 @@ config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longreque
 config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longrequest-logger-timeout', 1)) }}
 config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-threshold', "10MB")) }}
 config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
-config-with-max-rlimit-nofile = {{ dumps(slapparameter_dict.get('with-max-rlimit-nofile', false)) }}
+config-with-max-rlimit-nofile = {{ dumps(with_max_rlimit_nofile_enable) }}
 {# BBB: zope_parameter_dict used to contain 'webdav', so fallback to it -#}
 config-webdav = {{ dumps(current_zope_family_override_dict.get('webdav', zope_parameter_dict.get('webdav', False))) }}
 config-publisher-timeout = {{ dumps(current_zope_family_override_dict.get('publisher-timeout', global_publisher_timeout)) }}

stack/erp5/instance.cfg.in

@@ -43,6 +43,7 @@ init =
 default-cloudooo-url-list = ${default-cloudooo-url-list:url-list}
 jupyter-enable-default = {{ jupyter_enable_default }}
 wcfs-enable-default = {{ wcfs_enable_default }}
+with-max-rlimit-nofile-enable-default = {{ with_max_rlimit_nofile_enable_default }}
 local-bt5-repository = {{ ' '.join(local_bt5_repository.split()) }}
 
 [context]
@@ -58,6 +59,7 @@ extra-context =
     key default_cloudooo_url_list dynamic-template-erp5-parameters:default-cloudooo-url-list
     key jupyter_enable_default dynamic-template-erp5-parameters:jupyter-enable-default
     key wcfs_enable_default dynamic-template-erp5-parameters:wcfs-enable-default
+    key with_max_rlimit_nofile_enable_default dynamic-template-erp5-parameters:with-max-rlimit-nofile-enable-default
     key local_bt5_repository dynamic-template-erp5-parameters:local-bt5-repository
     key openssl_location :openssl-location
     import re re