Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15167 from edx/efischer/update_celeryutils

Browse Source 
Make use of ChordableDjangoBackend
This commit is contained in:
Eric Fischer
2017-06-20 09:45:07 -04:00
committed by GitHub
parent fe9cce59ab 992a6ed066
commit 49c0342e73
9 changed files with 95 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/test/db_cache/bok_choy_data_default.json
View File

File diff suppressed because one or more lines are too long

4
common/test/db_cache/bok_choy_migrations_data_default.sql
View File

File diff suppressed because one or more lines are too long

4
common/test/db_cache/bok_choy_migrations_data_student_module_history.sql
View File

File diff suppressed because one or more lines are too long

94
common/test/db_cache/bok_choy_schema_default.sql
View File

@@ -475,7 +475,7 @@ CREATE TABLE `auth_permission` (
PRIMARY KEY (`id`),
UNIQUE KEY `content_type_id` (`content_type_id`,`codename`),
CONSTRAINT `auth__content_type_id_508cf46651277a81_fk_django_content_type_id` FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=984 DEFAULT CHARSET=utf8;
) ENGINE=InnoDB AUTO_INCREMENT=996 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `auth_registration`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
@@ -946,6 +946,32 @@ CREATE TABLE `celery_tasksetmeta` (
KEY `celery_tasksetmeta_662f707d` (`hidden`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `celery_utils_chorddata`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `celery_utils_chorddata` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`serialized_callback` longtext NOT NULL,
`callback_result_id` int(11) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `callback_result_id` (`callback_result_id`),
CONSTRAINT `celery_callback_result_id_230f1d5ec4608165_fk_celery_taskmeta_id` FOREIGN KEY (`callback_result_id`) REFERENCES `celery_taskmeta` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `celery_utils_chorddata_completed_results`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `celery_utils_chorddata_completed_results` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`chorddata_id` int(11) NOT NULL,
`taskmeta_id` int(11) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `chorddata_id` (`chorddata_id`,`taskmeta_id`),
KEY `celery_utils__taskmeta_id_16beefb23621d690_fk_celery_taskmeta_id` (`taskmeta_id`),
CONSTRAINT `celery_chorddata_id_2abad2f2a442ac5_fk_celery_utils_chorddata_id` FOREIGN KEY (`chorddata_id`) REFERENCES `celery_utils_chorddata` (`id`),
CONSTRAINT `celery_utils__taskmeta_id_16beefb23621d690_fk_celery_taskmeta_id` FOREIGN KEY (`taskmeta_id`) REFERENCES `celery_taskmeta` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `celery_utils_failedtask`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
@@ -2001,7 +2027,7 @@ CREATE TABLE `django_content_type` (
`model` varchar(100) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `django_content_type_app_label_45f3b1d93ec8c61c_uniq` (`app_label`,`model`)
) ENGINE=InnoDB AUTO_INCREMENT=327 DEFAULT CHARSET=utf8;
) ENGINE=InnoDB AUTO_INCREMENT=331 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `django_migrations`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
@@ -2012,7 +2038,7 @@ CREATE TABLE `django_migrations` (
`name` varchar(255) NOT NULL,
`applied` datetime(6) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=266 DEFAULT CHARSET=utf8;
) ENGINE=InnoDB AUTO_INCREMENT=275 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `django_openid_auth_association`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
@@ -2117,8 +2143,6 @@ CREATE TABLE `djcelery_periodictask` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(200) NOT NULL,
`task` varchar(200) NOT NULL,
`interval_id` int(11) DEFAULT NULL,
`crontab_id` int(11) DEFAULT NULL,
`args` longtext NOT NULL,
`kwargs` longtext NOT NULL,
`queue` varchar(200) DEFAULT NULL,
@@ -2130,10 +2154,12 @@ CREATE TABLE `djcelery_periodictask` (
`total_run_count` int(10) unsigned NOT NULL,
`date_changed` datetime(6) NOT NULL,
`description` longtext NOT NULL,
`crontab_id` int(11) DEFAULT NULL,
`interval_id` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`),
KEY `djc_interval_id_20cfc1cad060dfad_fk_djcelery_intervalschedule_id` (`interval_id`),
KEY `djcel_crontab_id_1d8228f5b44b680a_fk_djcelery_crontabschedule_id` (`crontab_id`),
KEY `djc_interval_id_20cfc1cad060dfad_fk_djcelery_intervalschedule_id` (`interval_id`),
CONSTRAINT `djc_interval_id_20cfc1cad060dfad_fk_djcelery_intervalschedule_id` FOREIGN KEY (`interval_id`) REFERENCES `djcelery_intervalschedule` (`id`),
CONSTRAINT `djcel_crontab_id_1d8228f5b44b680a_fk_djcelery_crontabschedule_id` FOREIGN KEY (`crontab_id`) REFERENCES `djcelery_crontabschedule` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -2164,15 +2190,15 @@ CREATE TABLE `djcelery_taskstate` (
`traceback` longtext,
`runtime` double DEFAULT NULL,
`retries` int(11) NOT NULL,
`worker_id` int(11) DEFAULT NULL,
`hidden` tinyint(1) NOT NULL,
`worker_id` int(11),
PRIMARY KEY (`id`),
UNIQUE KEY `task_id` (`task_id`),
KEY `djcelery_t_worker_id_30050731b1c3d3d9_fk_djcelery_workerstate_id` (`worker_id`),
KEY `djcelery_taskstate_9ed39e2e` (`state`),
KEY `djcelery_taskstate_b068931c` (`name`),
KEY `djcelery_taskstate_863bb2ee` (`tstamp`),
KEY `djcelery_taskstate_662f707d` (`hidden`),
KEY `djcelery_taskstate_ce77e6ef` (`worker_id`),
CONSTRAINT `djcelery_t_worker_id_30050731b1c3d3d9_fk_djcelery_workerstate_id` FOREIGN KEY (`worker_id`) REFERENCES `djcelery_workerstate` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -2430,6 +2456,7 @@ CREATE TABLE `enterprise_enterprisecustomer` (
`catalog` int(10) unsigned,
`enable_data_sharing_consent` tinyint(1) NOT NULL,
`enforce_data_sharing_consent` varchar(25) NOT NULL,
`enable_audit_enrollment` tinyint(1) NOT NULL,
PRIMARY KEY (`uuid`),
KEY `enterprise_enterprisecustomer_9365d6e7` (`site_id`),
CONSTRAINT `enterprise_enterprise_site_id_41ce54c2601930cd_fk_django_site_id` FOREIGN KEY (`site_id`) REFERENCES `django_site` (`id`)
@@ -2551,6 +2578,7 @@ CREATE TABLE `enterprise_historicalenterprisecustomer` (
`catalog` int(10) unsigned,
`enable_data_sharing_consent` tinyint(1) NOT NULL,
`enforce_data_sharing_consent` varchar(25) NOT NULL,
`enable_audit_enrollment` tinyint(1) NOT NULL,
PRIMARY KEY (`history_id`),
KEY `enterprise_hist_history_user_id_2938dabbace21ece_fk_auth_user_id` (`history_user_id`),
KEY `enterprise_historicalenterprisecustomer_ef7c876f` (`uuid`),
@@ -2769,6 +2797,20 @@ CREATE TABLE `grades_visibleblocks` (
KEY `grades_visibleblocks_ea134da7` (`course_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `instructor_task_gradereportsetting`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `instructor_task_gradereportsetting` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`change_date` datetime(6) NOT NULL,
`enabled` tinyint(1) NOT NULL,
`batch_size` int(11) NOT NULL,
`changed_by_id` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `instructor_task_g_changed_by_id_6a84d49e85aede81_fk_auth_user_id` (`changed_by_id`),
CONSTRAINT `instructor_task_g_changed_by_id_6a84d49e85aede81_fk_auth_user_id` FOREIGN KEY (`changed_by_id`) REFERENCES `auth_user` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `instructor_task_instructortask`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
@@ -4830,6 +4872,7 @@ CREATE TABLE `third_party_auth_ltiproviderconfig` (
`site_id` int(11) NOT NULL,
`drop_existing_session` tinyint(1) NOT NULL,
`max_session_length` int(10) unsigned DEFAULT NULL,
`skip_hinted_login_dialog` tinyint(1) NOT NULL,
PRIMARY KEY (`id`),
KEY `third_party_auth__changed_by_id_7749e09fd5f71ab0_fk_auth_user_id` (`changed_by_id`),
KEY `third_party_auth_ltiproviderconfig_fe8da584` (`lti_hostname`),
@@ -4861,6 +4904,7 @@ CREATE TABLE `third_party_auth_oauth2providerconfig` (
`site_id` int(11) NOT NULL,
`drop_existing_session` tinyint(1) NOT NULL,
`max_session_length` int(10) unsigned DEFAULT NULL,
`skip_hinted_login_dialog` tinyint(1) NOT NULL,
PRIMARY KEY (`id`),
KEY `third_party_auth__changed_by_id_17044d1cd96e8d57_fk_auth_user_id` (`changed_by_id`),
KEY `third_party_auth_oauth2providerconfig_abcd61c0` (`backend_name`),
@@ -4935,6 +4979,7 @@ CREATE TABLE `third_party_auth_samlproviderconfig` (
`identity_provider_type` varchar(128) NOT NULL,
`drop_existing_session` tinyint(1) NOT NULL,
`max_session_length` int(10) unsigned DEFAULT NULL,
`skip_hinted_login_dialog` tinyint(1) NOT NULL,
PRIMARY KEY (`id`),
KEY `third_party_auth__changed_by_id_508190ecd0b0e845_fk_auth_user_id` (`changed_by_id`),
KEY `third_party_auth_samlproviderconfig_098674f1` (`idp_slug`),
@@ -5374,6 +5419,24 @@ CREATE TABLE `waffle_switch` (
KEY `waffle_switch_e2fa5388` (`created`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `waffle_utils_waffleflagcourseoverridemodel`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `waffle_utils_waffleflagcourseoverridemodel` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`change_date` datetime(6) NOT NULL,
`enabled` tinyint(1) NOT NULL,
`waffle_flag` varchar(255) NOT NULL,
`course_id` varchar(255) NOT NULL,
`override_choice` varchar(3) NOT NULL,
`changed_by_id` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `waffle_utils_waff_changed_by_id_3b230839b4c20581_fk_auth_user_id` (`changed_by_id`),
KEY `waffle_utils_waffleflagcourseoverridemodel_6690e26e` (`waffle_flag`),
KEY `waffle_utils_waffleflagcourseoverridemodel_ea134da7` (`course_id`),
CONSTRAINT `waffle_utils_waff_changed_by_id_3b230839b4c20581_fk_auth_user_id` FOREIGN KEY (`changed_by_id`) REFERENCES `auth_user` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `wiki_article`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
@@ -5664,6 +5727,21 @@ CREATE TABLE `workflow_assessmentworkflowstep` (
CONSTRAINT `w_workflow_id_4939c36cf6220ba3_fk_workflow_assessmentworkflow_id` FOREIGN KEY (`workflow_id`) REFERENCES `workflow_assessmentworkflow` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `xblock_config_courseeditltifieldsenabledflag`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `xblock_config_courseeditltifieldsenabledflag` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`change_date` datetime(6) NOT NULL,
`enabled` tinyint(1) NOT NULL,
`course_id` varchar(255) NOT NULL,
`changed_by_id` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `xblock_config_cou_changed_by_id_124d91bd160908dd_fk_auth_user_id` (`changed_by_id`),
KEY `xblock_config_courseeditltifieldsenabledflag_ea134da7` (`course_id`),
CONSTRAINT `xblock_config_cou_changed_by_id_124d91bd160908dd_fk_auth_user_id` FOREIGN KEY (`changed_by_id`) REFERENCES `auth_user` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
DROP TABLE IF EXISTS `xblock_config_studioconfig`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;

2
common/test/db_cache/bok_choy_schema_student_module_history.sql
View File

@@ -35,7 +35,7 @@ CREATE TABLE `django_migrations` (
`name` varchar(255) NOT NULL,
`applied` datetime(6) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=266 DEFAULT CHARSET=utf8;
) ENGINE=InnoDB AUTO_INCREMENT=275 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

BIN
common/test/db_cache/lettuce.db
View File

Binary file not shown.

BIN
common/test/db_cache/lettuce_student_module_history.db
View File

Binary file not shown.

10
lms/envs/bok_choy.py
View File

@@ -232,15 +232,7 @@ if RELEASE_LINE == "master":
'course_author': 'http://edx.readthedocs.io/projects/edx-partner-course-staff',
}
# TODO: TNL-6546: Remove this waffle and flag code.
from django.db.utils import ProgrammingError
from waffle.models import Flag
try:
flag, created = Flag.objects.get_or_create(name='unified_course_view')
WAFFLE_OVERRIDE = True
except ProgrammingError:
# during initial reset_db, the table for the flag doesn't yet exist.
pass
WAFFLE_OVERRIDE = True
#####################################################################
# Lastly, see if the developer has any local overrides.

4
requirements/edx/base.txt
View File

@@ -16,7 +16,7 @@ dealer==2.0.4
defusedxml==0.4.1
django-babel-underscore==0.5.1
markey==0.8 # From django-babel-underscore
django-celery==3.1.16
django-celery==3.2.1
django-config-models==0.1.3
django-countries==4.0
django-extensions==1.5.9
@@ -43,7 +43,7 @@ django-waffle==0.11.1
djangorestframework-jwt==1.8.0
djangorestframework-oauth==1.1.0
edx-ccx-keys==0.2.1
edx-celeryutils==0.1.5
edx-celeryutils==0.2.2
edx-drf-extensions==1.2.2
edx-i18n-tools==0.3.7
edx-lint==0.4.3