Merge pull request #1423 from edx/jarv/max-req

settings max-requests

playbooks/roles/edxapp/defaults/main.yml

@@ -19,6 +19,12 @@
 EDXAPP_LMS_BASE: ""
 EDXAPP_PREVIEW_LMS_BASE: ""
 EDXAPP_CMS_BASE: ""
+
+# Set this to the maximum number
+# of requests for gunicorn for the lms and cms
+# gunicorn --max-requests <num>
+EDXAPP_LMS_MAX_REQ: !!null
+EDXAPP_CMS_MAX_REQ: !!null
 # 'None' will be written out as null in
 # the configuration on disk
 EDXAPP_AWS_ACCESS_KEY_ID:  "None"
@@ -396,7 +402,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
   MODULESTORE:
     default:
         ENGINE: 'xmodule.modulestore.mixed.MixedModuleStore'
-        OPTIONS:  
+        OPTIONS:
           mappings: $EDXAPP_XML_MAPPINGS
           stores:
             - &edxapp_generic_draft_modulestore
@@ -570,7 +576,7 @@ cms_auth_config:
   MODULESTORE:
     default:
         ENGINE: 'xmodule.modulestore.mixed.MixedModuleStore'
-        OPTIONS: 
+        OPTIONS:
 # See commented section below. LMS-11258
 #          mappings: $EDXAPP_XML_MAPPINGS
           mappings: {}

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

 [program:cms]
 
-{% if COMMON_ENABLE_NEWRELIC %}
-{% set executable = edxapp_venv_dir + '/bin/newrelic-admin run-program ' + edxapp_venv_dir + '/bin/gunicorn' %}
-{% else %}
-{% set executable = edxapp_venv_dir + '/bin/gunicorn' %}
-{% endif %}
+{% if COMMON_ENABLE_NEWRELIC -%}
+{% set executable = edxapp_venv_dir + '/bin/newrelic-admin run-program ' + edxapp_venv_dir + '/bin/gunicorn' -%}
+{% else -%}
+{% set executable = edxapp_venv_dir + '/bin/gunicorn' -%}
+{% endif -%}
+{% if EDXAPP_CMS_MAX_REQ -%}
+{% set max_req = '--max-requests ' + EDXAPP_CMS_MAX_REQ -%}
+{% else -%}
+{% set max_req = '' -%}
+{% endif -%}
 
 {% if EDXAPP_WORKERS -%}
-command={{ executable }} --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ EDXAPP_WORKERS.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} cms.wsgi
+command={{ executable }} {{ max_req }} --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ EDXAPP_WORKERS.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} cms.wsgi
 {% else -%}
 {# This is for backwards compatibility, set workers explicitely using EDXAPP_WORKERS #}
 {% if ansible_processor|length > 0 -%}
-command={{ executable }}  --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ ansible_processor|length * worker_core_mult.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} cms.wsgi
+command={{ executable }} {{ max_req }} --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ ansible_processor|length * worker_core_mult.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} cms.wsgi
 {% else -%}
-command={{ executable }} --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ worker_core_mult.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} cms.wsgi
+command={{ executable }} {{ max_req }} --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ worker_core_mult.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} cms.wsgi
 {% endif -%}
 {% endif -%}
 

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

 [program:lms]
 
-{% if COMMON_ENABLE_NEWRELIC %}
-{% set executable = edxapp_venv_dir + '/bin/newrelic-admin run-program ' + edxapp_venv_dir + '/bin/gunicorn' %}
-{% else %}
-{% set executable = edxapp_venv_dir + '/bin/gunicorn' %}
-{% endif %}
+{% if COMMON_ENABLE_NEWRELIC -%}
+{% set executable = edxapp_venv_dir + '/bin/newrelic-admin run-program ' + edxapp_venv_dir + '/bin/gunicorn' -%}
+{% else -%}
+{% set executable = edxapp_venv_dir + '/bin/gunicorn' -%}
+{% endif -%}
+
+{% if EDXAPP_LMS_MAX_REQ -%}
+{% set max_req = '--max-requests ' + EDXAPP_LMS_MAX_REQ -%}
+{% else -%}
+{% set max_req = '' -%}
+{% endif -%}
 
 {% if EDXAPP_WORKERS -%}
-command={{ executable }} --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ EDXAPP_WORKERS.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} lms.wsgi
+command={{ executable }} {{ max_req }} --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ EDXAPP_WORKERS.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} lms.wsgi
 {% else -%}
 {# This is for backwards compatibility, set workers explicitely using EDXAPP_WORKERS #}
 {% if ansible_processor|length > 0 -%}
-command={{ executable }} --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ ansible_processor|length * worker_core_mult.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} lms.wsgi
+command={{ executable }} {{ max_req }} --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ ansible_processor|length * worker_core_mult.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} lms.wsgi
 {% else -%}
-command={{ executable }} --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ worker_core_mult.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} lms.wsgi
+command={{ executable }} {{ max_req }} --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ worker_core_mult.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} lms.wsgi
 {% endif %}
 {% endif %}