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

Merge pull request #4477 from edx/studio/minimal-fix-import-performance

Browse Source 
Studio/minimal fix import performance
This commit is contained in:
Nimisha Asthagiri
2014-07-18 09:51:28 -04:00
parent c256539627 a501aa9400
commit 23cb549925
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/lib/xmodule/xmodule/modulestore/mixed.py
View File

@@ -497,8 +497,8 @@ def store_bulk_write_operations_on_course(store, course_id):
# request comes in for the same course.
# if the caller passed in the mixed modulestore, get a direct pointer to the underlying store
if hasattr(store, '_get_modulestore_by_course_id'):
store = store._get_modulestore_by_course_id(course_id)
if hasattr(store, '_get_modulestore_for_courseid'):
store = store._get_modulestore_for_courseid(course_id)
try:
if hasattr(store, 'begin_bulk_write_operation_on_course'):

14
common/lib/xmodule/xmodule/modulestore/mongo/base.py
View File

@@ -405,6 +405,13 @@ class MongoModuleStore(ModuleStoreWriteBase):
self.ignore_write_events_on_courses.remove(course_id)
self.refresh_cached_metadata_inheritance_tree(course_id)
def _is_bulk_write_in_progress(self, course_id):
"""
Returns whether a bulk write operation is in progress for the given course.
"""
# check with branch set to None
return course_id in self.ignore_write_events_on_courses
def _fill_in_run(self, course_key):
if course_key.run is not None:
return course_key
@@ -552,7 +559,7 @@ class MongoModuleStore(ModuleStoreWriteBase):
If given a runtime, it replaces the cached_metadata in that runtime. NOTE: failure to provide
a runtime may mean that some objects report old values for inherited data.
"""
if course_id not in self.ignore_write_events_on_courses:
if not self._is_bulk_write_in_progress(course_id):
# below is done for side effects when runtime is None
cached_metadata = self._get_cached_metadata_inheritance_tree(course_id, force_refresh=True)
if runtime:
@@ -1033,7 +1040,10 @@ class MongoModuleStore(ModuleStoreWriteBase):
# update subtree edited info for ancestors
# don't update the subtree info for descendants of the publish root for efficiency
if (not isPublish) or (isPublish and is_publish_root):
if (
(not isPublish or (isPublish and is_publish_root)) and
not self._is_bulk_write_in_progress(xblock.location.course_key)
):
ancestor_payload = {
'edit_info.subtree_edited_on': now,
'edit_info.subtree_edited_by': user_id