slaprunner: add configurable cpu-ratio parameter

software/slaprunner/common.cfg

@@ -43,7 +43,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 403074d7563ff122fa9a5b29ec4ba8a8
+md5sum = c2c25d668816ab3c32a79c33d05769fd
 mode = 0644
 
 [template-runner-import-script]
@@ -145,7 +145,7 @@ mode = 0644
 [template-supervisord]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/${:filename}
-md5sum = af2d78440a358ec268d7ece4fce99ec9
+md5sum = 239fe88e1522afe7686572dd34568720
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = supervisord.conf.in
 download-only = true

software/slaprunner/instance-runner.cfg

@@ -672,7 +672,10 @@ recipe = slapos.recipe.template:jinja2
 template = ${template-supervisord:location}/${template-supervisord:filename}
 rendered = $${directory:etc}/supervisord.conf
 context =
+    import multiprocessing multiprocessing
+    import builtin __builtin__
     section supervisord supervisord
+    key slapparameter_dict slap-configuration:configuration
     key listener_slapgrid listener-slapgrid-bin:rendered
 
 [listener-slapgrid-bin]

software/slaprunner/schema.json

@@ -91,6 +91,11 @@
             "minimum": 9683,
             "exclusiveMinimum": true,
         },
+        "cpu-usage-ratio": {
+            "description": "Ratio of the CPU use for compilation, if value is set to n, compilation will use number-of-cpu/n of cpus (need instance restart)",
+            "type": "integer",
+            "default" : 4
+        },
         "resilient-clone-number": {
             "title": "Number of Resilient Clones",
             "description": "Number of clones to be deployed when a resilient runner, if missing a single clone is provided. Its value can be 1 or 2",

software/slaprunner/template/supervisord.conf.in

@@ -26,7 +26,7 @@ autorestart = {{ supervisord['autorestart'] }}
 stdout_logfile = {{ supervisord['no_logfile'] }}
 stderr_logfile = {{ supervisord['no_logfile'] }}
 directory = {{ supervisord['directory'] }}
-environment = PATH="{{- supervisord['path'] -}}"
+environment = PATH="{{- supervisord['path'] -}}",MAKEFLAGS="-j{{- '%d' % builtin.max(1, (multiprocessing.cpu_count() / builtin.int(slapparameter_dict.get('cpu-usage-ration', 4)))) -}}"
 
 [program:{{- supervisord['slapgrid-cp'] -}}]
 command = {{ supervisord['slapgrid-cp-command'] }}

[Kirill Smelkov]

@cedric.leninivin is this a typo?

input schema documents 'cpu-usage-ratio', but the parameter which is actually used is 'cpu-usage-ration' (with n).

[Cédric Le Ninivin]

Indeed a typo

[Kirill Smelkov]

thanks. Would you please fix?

[Cédric Le Ninivin]

For sure

[Cédric Le Ninivin]

Actually has been fixed a few month ago: https://lab.nexedi.cn/nexedi/slapos/commit/e9fd1dbed4bf5966566b6cdebf9a617ccc981261

[Cédric Le Ninivin]

Actually has been fixed a few month ago: https://lab.nexedi.cn/nexedi/slapos/commit/e9fd1dbed4bf5966566b6cdebf9a617ccc981261

[Kirill Smelkov]

Thanks for pointing it out. I was somehow fulled by using old webrunner and blaming not very recent slapos branch. Sorry.