From b2286f4b5d7e8e8eebf74313965ae46bc8b31414 Mon Sep 17 00:00:00 2001 From: Yagnesh1998 <127923546+Yagnesh1998@users.noreply.github.com> Date: Tue, 8 Aug 2023 17:37:04 +0530 Subject: [PATCH] feat: Update models.py --- .../djangoapps/content/block_structure/models.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/openedx/core/djangoapps/content/block_structure/models.py b/openedx/core/djangoapps/content/block_structure/models.py index 285deafa7d..6bb1810839 100644 --- a/openedx/core/djangoapps/content/block_structure/models.py +++ b/openedx/core/djangoapps/content/block_structure/models.py @@ -234,11 +234,11 @@ class BlockStructureModel(TimeStampedModel): with _storage_error_handling(bs_model, operation): bs_model.data.save('', ContentFile(serialized_data)) - cls._log(bs_model, operation, serialized_data) - if not created: cls._prune_files(data_usage_key) - + + cls._log(bs_model, operation, serialized_data) + return bs_model, created def __str__(self): @@ -262,6 +262,14 @@ class BlockStructureModel(TimeStampedModel): all_files_by_date = sorted(cls._get_all_files(data_usage_key)) files_to_delete = all_files_by_date[:-num_to_keep] if num_to_keep > 0 else all_files_by_date # lint-amnesty, pylint: disable=invalid-unary-operand-type cls._delete_files(files_to_delete) + log.info( + 'BlockStructure: Deleted %d out of total %d files in store; data_usage_key: %s, num_to_keep: %d.', + len(files_to_delete), + len(all_files_by_date), + data_usage_key, + num_to_keep, + ) + except Exception: # pylint: disable=broad-except log.exception('BlockStructure: Exception when deleting old files; data_usage_key: %s.', data_usage_key)