Merge pull request #3589 from mboersma/rightsize-gunicorn

feat(controller): allow user to scale gunicorn worker processes

Author: mboersma

controller/conf.d/gconf.toml

@@ -0,0 +1,10 @@
+[template]
+src   = "gconf.py"
+dest  = "/app/deis/gconf.py"
+uid = 1000
+gid = 1000
+mode  = "0640"
+keys = [
+  "/deis/controller",
+]
+reload_cmd = "/app/bin/reload"

controller/deis/gconf.py controller/templates/gconf.pycontroller/deis/gconf.py renamed to controller/templates/gconf.py

@@ -1,5 +1,12 @@
 bind = '0.0.0.0'
-workers = 8
+try:
+    workers = int({{ if exists "/deis/controller/workers" }}{{ getv "/deis/controller/workers" }}{{ else }}"not set"{{end}})
+except (NameError, ValueError):
+    import multiprocessing
+    try:
+        workers = multiprocessing.cpu_count() * 2 + 1
+    except NotImplementedError:
+        workers = 8
 proc_name = 'deis-controller'
 timeout = 1200
 pidfile = '/tmp/gunicorn.pid'

docs/customizing_deis/controller_settings.rst

@@ -41,6 +41,7 @@ setting                                   description
 ====================================      ======================================================
 /deis/controller/registrationMode         set registration to "enabled", "disabled", or "admin_only" (default: "enabled")
 /deis/controller/webEnabled               enable controller web UI (default: false)
+/deis/controller/workers                  number of web worker processes (default: CPU cores * 2 + 1)
 /deis/cache/host                          host of the cache component (set by cache)
 /deis/cache/port                          port of the cache component (set by cache)
 /deis/database/host                       host of the database component (set by database)