From 68e760ff292d85ab207bd02cb178adc5ce561948 Mon Sep 17 00:00:00 2001 From: Qubad786 <muhammadrehan69@gmail.com> Date: Tue, 10 Jul 2018 17:12:42 +0500 Subject: [PATCH] Move transcript migrations tasks to low priority queue --- cms/djangoapps/contentstore/tasks.py | 8 +++++--- cms/envs/aws.py | 3 +++ cms/envs/common.py | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cms/djangoapps/contentstore/tasks.py b/cms/djangoapps/contentstore/tasks.py index cf56587706f..2cef65ca49a 100644 --- a/cms/djangoapps/contentstore/tasks.py +++ b/cms/djangoapps/contentstore/tasks.py @@ -84,7 +84,7 @@ COURSE_LEVEL_TIMEOUT_SECONDS = 1200 VIDEO_LEVEL_TIMEOUT_SECONDS = 300 -@chord_task(bind=True) +@chord_task(bind=True, routing_key=settings.VIDEO_TRANSCRIPT_MIGRATIONS_JOB_QUEUE) def task_status_callback(self, results, revision, # pylint: disable=unused-argument course_id, command_run, video_location): """ @@ -157,7 +157,8 @@ def get_course_videos(course_key): base=LoggedPersistOnFailureTask, default_retry_delay=RETRY_DELAY_SECONDS, max_retries=1, - time_limit=COURSE_LEVEL_TIMEOUT_SECONDS + time_limit=COURSE_LEVEL_TIMEOUT_SECONDS, + routing_key=settings.VIDEO_TRANSCRIPT_MIGRATIONS_JOB_QUEUE ) def async_migrate_transcript(self, course_key, **kwargs): # pylint: disable=unused-argument """ @@ -251,7 +252,8 @@ def save_transcript_to_storage(command_run, edx_video_id, language_code, transcr base=LoggedPersistOnFailureTask, default_retry_delay=RETRY_DELAY_SECONDS, max_retries=2, - time_limit=VIDEO_LEVEL_TIMEOUT_SECONDS + time_limit=VIDEO_LEVEL_TIMEOUT_SECONDS, + routing_key=settings.VIDEO_TRANSCRIPT_MIGRATIONS_JOB_QUEUE ) def async_migrate_transcript_subtask(self, *args, **kwargs): # pylint: disable=unused-argument """ diff --git a/cms/envs/aws.py b/cms/envs/aws.py index d5b652af061..407effa4d17 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -546,6 +546,9 @@ HELP_TOKENS_BOOKS = ENV_TOKENS.get('HELP_TOKENS_BOOKS', HELP_TOKENS_BOOKS) ############## Settings for CourseGraph ############################ COURSEGRAPH_JOB_QUEUE = ENV_TOKENS.get('COURSEGRAPH_JOB_QUEUE', LOW_PRIORITY_QUEUE) +########## Settings for video transcript migration tasks ############ +VIDEO_TRANSCRIPT_MIGRATIONS_JOB_QUEUE = ENV_TOKENS.get('VIDEO_TRANSCRIPT_MIGRATIONS_JOB_QUEUE', LOW_PRIORITY_QUEUE) + ########################## Parental controls config ####################### # The age at which a learner no longer requires parental consent, or None diff --git a/cms/envs/common.py b/cms/envs/common.py index 8e84efeea94..b2d04963bcb 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1494,6 +1494,9 @@ POLICY_CHANGE_TASK_RATE_LIMIT = '300/h' ############## Settings for CourseGraph ############################ COURSEGRAPH_JOB_QUEUE = LOW_PRIORITY_QUEUE +########## Settings for video transcript migration tasks ############ +VIDEO_TRANSCRIPT_MIGRATIONS_JOB_QUEUE = LOW_PRIORITY_QUEUE + ###################### VIDEO IMAGE STORAGE ###################### VIDEO_IMAGE_DEFAULT_FILENAME = 'images/video-images/default_video_image.png' -- GitLab