Merge branch 'rav/cache_hacking/3' into rav/cache_hacking/work

matrix-org · Oct 21, 2020 · 8329346 · 8329346
2 parents 83b2712 + c13820b
commit 8329346
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/synapse/util/caches/deferred_cache.py b/synapse/util/caches/deferred_cache.py
@@ -31,6 +31,7 @@
 from prometheus_client import Gauge
 
 from twisted.internet import defer
+from twisted.python import failure
 
 from synapse.util.async_helpers import ObservableDeferred
 from synapse.util.caches.lrucache import LruCache
@@ -223,7 +224,9 @@ def set(
 
         # we can save a whole load of effort if the deferred is ready.
         if value.called:
-            self.cache.set(key, value.result, callbacks)
+            result = value.result
+            if not isinstance(result, failure.Failure):
+                self.cache.set(key, result, callbacks)
             return value
 
         # otherwise, we'll add an entry to the _pending_deferred_cache for now,