From a5613675157d031740c7fa451181c4e523cc8dc7 Mon Sep 17 00:00:00 2001 From: Kevin Falcone Date: Tue, 1 Mar 2016 14:00:13 -0500 Subject: [PATCH] This should not be needed, we specify ATOMIC_REQUESTS on each DB There is one DB where we do not want it specified since transactions on the CSMHE table when we aren't atomic across databases isn't a win. --- cms/envs/aws.py | 6 ------ lms/envs/aws.py | 6 ------ 2 files changed, 12 deletions(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 0139c70062..9aadf61eab 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -274,12 +274,6 @@ else: DATABASES = AUTH_TOKENS['DATABASES'] -# Enable automatic transaction management on all databases -# https://docs.djangoproject.com/en/1.8/topics/db/transactions/#tying-transactions-to-http-requests -# This needs to be true for all databases -for database_name in DATABASES: - DATABASES[database_name]['ATOMIC_REQUESTS'] = True - MODULESTORE = convert_module_store_setting_if_needed(AUTH_TOKENS.get('MODULESTORE', MODULESTORE)) CONTENTSTORE = AUTH_TOKENS['CONTENTSTORE'] DOC_STORE_CONFIG = AUTH_TOKENS['DOC_STORE_CONFIG'] diff --git a/lms/envs/aws.py b/lms/envs/aws.py index d5935394af..fac0fc2bed 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -439,12 +439,6 @@ FILE_UPLOAD_STORAGE_PREFIX = ENV_TOKENS.get('FILE_UPLOAD_STORAGE_PREFIX', FILE_U # function in util/query.py, which is useful for very large database reads DATABASES = AUTH_TOKENS['DATABASES'] -# Enable automatic transaction management on all databases -# https://docs.djangoproject.com/en/1.8/topics/db/transactions/#tying-transactions-to-http-requests -# This needs to be true for all databases -for database_name in DATABASES: - DATABASES[database_name]['ATOMIC_REQUESTS'] = True - XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE'] # Get the MODULESTORE from auth.json, but if it doesn't exist,