Recreate a chunk in case of UnpicklingError (#7251)

Resolved #7251
cvat-ai · Dec 11, 2023 · e472fad · e472fad
1 parent 72379e2
commit e472fad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/changelog.d/20231208_152516_andrey_workarround_cache_corrupted_data.md b/changelog.d/20231208_152516_andrey_workarround_cache_corrupted_data.md
@@ -1,4 +1,4 @@
 ### Fixed
 
 - Added workaround for corrupted cached chunks
-  (<https://github.com/opencv/cvat/pull/7243>)
+  (<https://github.com/opencv/cvat/pull/7243>, <https://github.com/opencv/cvat/pull/7251>)
diff --git a/cvat/apps/engine/cache.py b/cvat/apps/engine/cache.py
@@ -16,6 +16,7 @@
 
 import cv2
 import PIL.Image
+import pickle # nosec
 from django.conf import settings
 from django.core.cache import caches
 from rest_framework.exceptions import NotFound, ValidationError
@@ -56,8 +57,13 @@ def create_item():
             return item
 
         slogger.glob.info(f'Starting to get chunk from cache: key {key}')
-        item = self._cache.get(key)
+        try:
+            item = self._cache.get(key)
+        except pickle.UnpicklingError:
+            slogger.glob.error(f'Unable to get item from cache: key {key}', exc_info=True)
+            item = None
         slogger.glob.info(f'Ending to get chunk from cache: key {key}, is_cached {bool(item)}')
+
         if not item:
             item = create_item()
         else: