Use FrozenEvent's reject_reason to decide whether to return it; don't include allow_rejected in the main getEvents cache key

1 files changed, 14 insertions, 10 deletions

diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 7f5ad9b0fb..919295eabb 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -749,10 +749,13 @@ class SQLBaseStore(object):
 
         try:
             # Separate cache entries for each way to invoke _get_event_txn
-            ret = cache[(check_redacted, get_prev_content, allow_rejected)]
-
+            ret = cache[(check_redacted, get_prev_content)]
             cache_counter.inc_hits("*getEvent*")
-            return ret
+
+            if allow_rejected or not ret.rejected_reason:
+                return ret
+            else:
+                return None
         except KeyError:
             cache_counter.inc_misses("*getEvent*")
             pass
@@ -779,14 +782,15 @@ class SQLBaseStore(object):
 
         start_time = update_counter("select_event", start_time)
 
+        result = self._get_event_from_row_txn(
+            txn, internal_metadata, js, redacted,
+            check_redacted=check_redacted,
+            get_prev_content=get_prev_content,
+            rejected_reason=rejected_reason,
+        )
+        cache[(check_redacted, get_prev_content)] = result
+
         if allow_rejected or not rejected_reason:
-            result = self._get_event_from_row_txn(
-                txn, internal_metadata, js, redacted,
-                check_redacted=check_redacted,
-                get_prev_content=get_prev_content,
-                rejected_reason=rejected_reason,
-            )
-            cache[(check_redacted, get_prev_content, allow_rejected)] = result
             return result
         else:
             return None