Merge pull request #115 from edx/jbau/use-facter-proc-count

if facter_processorcount is set, use that to determine # lms/cms/etc workers

playbooks/edx-west/edxapp_prod.yml

 #- hosts: tag_environment_prod:&tag_function_webserver
-- hosts: ~tag_Name_app(11|21)_prod
+- hosts: ~tag_Name_app(10|20)_prod
 #- hosts: tag_environment_prod:&tag_function_webserver
 #- hosts: security_group_edx-prod-EdxappServerSecurityGroup-NSKCQTMZIPQB
   sudo: True

playbooks/roles/edxapp/templates/cms.conf.j2

@@ -13,7 +13,11 @@ respawn limit 3 30
 env PID=/var/tmp/cms.pid
 #env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
 #env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-env WORKERS={{ ansible_processor_cores * 2 }}
+{% if facter_processorcount %}
+env WORKERS={{ worker_core_mult.cms * facter_processorcount|int }}
+{% else %}
+env WORKERS={{ worker_core_mult.cms * ansible_processor_cores }}
+{% endif %}
 env PORT=8010
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=cms.envs.aws

playbooks/roles/edxapp/templates/lms-preview.conf.j2

@@ -12,7 +12,11 @@ respawn limit 3 30
 env PID=/var/tmp/lms.pid
 #env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
 #env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-env WORKERS={{ ansible_processor_cores * 2 }}
+{% if facter_processorcount %}
+env WORKERS={{ worker_core_mult.lms_preview * facter_processorcount|int }}
+{% else %}
+env WORKERS={{ worker_core_mult.lms_preview * ansible_processor_cores }}
+{% endif %}
 env PORT=8020
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=lms.envs.aws

playbooks/roles/edxapp/templates/lms-xml.conf.j2

@@ -12,7 +12,11 @@ respawn limit 3 30
 env PID=/var/tmp/lms-xml.pid
 #env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
 #env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-env WORKERS={{ ansible_processor_cores * 4 }}
+{% if facter_processorcount %}
+env WORKERS={{ worker_core_mult.lms_xml * facter_processorcount|int  }}
+{% else %}
+env WORKERS={{ worker_core_mult.lms_xml * ansible_processor_cores  }}
+{% endif %}
 env PORT=8030
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=lms.envs.aws

playbooks/roles/edxapp/templates/lms.conf.j2

@@ -12,7 +12,11 @@ respawn limit 3 30
 env PID=/var/tmp/lms.pid
 #env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
 #env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-env WORKERS={{ ansible_processor_cores * 2 }}
+{% if facter_processorcount %}
+env WORKERS={{ worker_core_mult.lms * facter_processorcount|int }}
+{% else %}
+env WORKERS={{ worker_core_mult.lms * ansible_processor_cores }}
+{% endif %}
 env PORT=8000
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=lms.envs.aws

playbooks/roles/edxapp/vars/main.yml

@@ -34,6 +34,13 @@ cms_env_config: {}
 lms_xml_auth_config: {}
 lms_xml_env_config: {}
 
+#Number of gunicorn worker processes to spawn, as a multipler to number of virtual cores
+worker_core_mult:
+  lms: 4
+  lms_preview: 2
+  lms_xml: 2
+  cms: 2
+
 #Theming
 #To turn off theming, specify edxapp_theme_name: ''
 #Stanford, for example, uses edxapp_theme_name: 'stanford'