Merge pull request #4476 from edx/jibsheet/cleanup-XQUEUE_WORKERS_PER_QUEUE

XQueue stopped using this config years ago

CHANGELOG.md

@@ -6,6 +6,7 @@
     Useful for external utilities that are reporting NR metrics.
   - Added XQUEUE_CONSUMER_NEWRELIC_APPNAME which is added to the supervisor start of xqueue_consumer
     if you have New Relic enabled.
+  - Retired XQUEUE_WORKERS_PER_QUEUE
     
 - Role edx_django_service
   - Added maintenance page under the flag EDX_DJANGO_SERVICE_ENABLE_S3_MAINTENANCE.

playbooks/roles/xqueue/defaults/main.yml

@@ -54,7 +54,6 @@ XQUEUE_CONSUMER_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT
 XQUEUE_SETTINGS_MODULE: "xqueue.aws_settings"
 # Set the number of workers explicitely for xqueue
 XQUEUE_WORKERS: !!null
-XQUEUE_WORKERS_PER_QUEUE: 12
 
 XQUEUE_SESSION_ENGINE: !!null
 XQUEUE_CACHES: !!null
@@ -83,7 +82,6 @@ xqueue_environment:
 
 xqueue_env_config:
   XQUEUES: "{{ XQUEUE_QUEUES }}"
-  XQUEUE_WORKERS_PER_QUEUE: "{{ XQUEUE_WORKERS_PER_QUEUE }}"
   LOGGING_ENV: "{{ XQUEUE_LOGGING_ENV }}"
   SYSLOG_SERVER: "{{ XQUEUE_SYSLOG_SERVER }}"
   LOG_DIR: "{{ COMMON_DATA_DIR }}/logs/xqueue"

playbooks/roles/xqueue/templates/xqueue_consumer.conf.j2

@@ -11,7 +11,7 @@ command={{ executable }} --pythonpath={{ xqueue_code_dir }} --settings=xqueue.{{
 user={{ common_web_user }}
 directory={{ xqueue_code_dir }}
 
-environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_STARTUP_TIMEOUT=10,NEW_RELIC_APP_NAME={{ XQUEUE_CONSUMER_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}LANG={{ XQUEUE_LANG }},WORKERS_PER_QUEUE={{xqueue_env_config.XQUEUE_WORKERS_PER_QUEUE}}
+environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_STARTUP_TIMEOUT=10,NEW_RELIC_APP_NAME={{ XQUEUE_CONSUMER_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}LANG={{ XQUEUE_LANG }}
 
 stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
 stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log

playbooks/sample_vars/server_vars.yml

@@ -80,7 +80,6 @@
 #AS_WORKERS: 1
 #ANALYTICS_WORKERS: 1
 #ANALYTICS_API_GUNICORN_WORKERS: 1
-#XQUEUE_WORKERS_PER_QUEUE: 2
 ## Settings for Grade downloads
 #EDXAPP_GRADE_STORAGE_TYPE: 's3'
 #EDXAPP_GRADE_BUCKET: 'your-grade-bucket'