diff --git a/cms/envs/devstack_with_worker.py b/cms/envs/devstack_with_worker.py index 959cd4f436..7b2819fe9d 100644 --- a/cms/envs/devstack_with_worker.py +++ b/cms/envs/devstack_with_worker.py @@ -20,8 +20,3 @@ from cms.envs.devstack import * CELERY_ALWAYS_EAGER = False CLEAR_REQUEST_CACHE_ON_TASK_COMPLETION = True BROKER_URL = 'redis://:password@edx.devstack.redis:6379/' - -# Disable transaction management because we are using a worker. Views -# that request a task and wait for the result will deadlock otherwise. -for database_name in DATABASES: - DATABASES[database_name]['ATOMIC_REQUESTS'] = False diff --git a/lms/envs/devstack_with_worker.py b/lms/envs/devstack_with_worker.py index 84d076445c..449c7f5c72 100644 --- a/lms/envs/devstack_with_worker.py +++ b/lms/envs/devstack_with_worker.py @@ -21,7 +21,3 @@ from lms.envs.devstack import * CELERY_ALWAYS_EAGER = False CLEAR_REQUEST_CACHE_ON_TASK_COMPLETION = True BROKER_URL = 'redis://:password@edx.devstack.redis:6379/' -# Disable transaction management because we are using a worker. Views -# that request a task and wait for the result will deadlock otherwise. -for database_name in DATABASES: - DATABASES[database_name]['ATOMIC_REQUESTS'] = False