WCM-633: handle cache los in object log sweep

ZeitOnline · Jan 16, 2025 · b57d11f · b57d11f
1 parent 21655f3
commit b57d11f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/core/src/zeit/objectlog/objectlog.py b/core/src/zeit/objectlog/objectlog.py
@@ -7,6 +7,7 @@
 import pendulum
 import persistent
 import transaction
+import ZODB.POSException
 import zope.app.keyreference.interfaces
 import zope.component
 import zope.interface
@@ -71,8 +72,12 @@ def clean(self, timedelta):
         remove = []
         for key in self._object_log:
             log = self._object_log[key]
-            for time_key in list(log.keys(max=reference_time)):
-                del log[time_key]
+            try:
+                for time_key in list(log.keys(max=reference_time)):
+                    del log[time_key]
+            except ZODB.POSException.POSKeyError:
+                logger.warning('ZODB.POSException.POSKeyError, removing lost key %s', key)
+                remove.append(key)
             if not log:
                 remove.append(key)
         for key in remove:

diff --git a/core/src/zeit/objectlog/tests/test_objectlog.py b/core/src/zeit/objectlog/tests/test_objectlog.py
@@ -1,12 +1,27 @@
-from datetime import datetime
+from datetime import datetime, timedelta
+from unittest import mock
 
 import transaction
+import ZODB.Connection
+import ZODB.POSException
 import zope.component
 
 import zeit.objectlog.interfaces
+import zeit.objectlog.objectlog
 import zeit.objectlog.testing
 
 
+class FakeLogItem:
+    # broken LogItem that mimics the cache loss behaviour of ZODB
+    def keys(self, *args, **kw):
+        raise ZODB.POSException.POSKeyError('foo')
+
+
+class FakeObjectLog(dict):
+    def __setitem__(self, key, _):
+        return super().__setitem__(key, FakeLogItem())
+
+
 class ObjectLog(zeit.objectlog.testing.FunctionalTestCase):
     def setUp(self):
         super().setUp()
@@ -30,3 +45,10 @@ def test_delete_removes_entries_of_object(self):
         log.delete(content2)
         self.assertEqual(0, len(list(log.get_log(content2))))
         self.assertEqual(1, len(list(log.get_log(self.content))))
+
+    def test_clean(self):
+        log = zope.component.getUtility(zeit.objectlog.interfaces.IObjectLog)
+        with mock.patch.object(log, '_object_log', FakeObjectLog()):
+            zeit.objectlog.interfaces.ILog(self.content).log('one')
+            log.clean(timedelta(days=0))
+            self.assertEqual(0, len(list(log.get_log(self.content))))