Fix rare error in ReadWriteLock when writers complete immediately

Signed-off-by: Sean Quah <[email protected]>

Author: Sean Quah

changelog.d/12105.bugfix

@@ -0,0 +1 @@
+Fix an extremely rare, long-standing bug in `ReadWriteLock` that would cause an error when a newly unblocked writer completes instantly.

synapse/util/async_helpers.py

@@ -545,7 +545,10 @@ def _ctx_manager() -> Iterator[None]:
             finally:
                 with PreserveLoggingContext():
                     new_defer.callback(None)
-                if self.key_to_current_writer[key] == new_defer:
+                # `self.key_to_current_writer[key]` may be missing if there was another
+                # writer waiting for us and it completed entirely within the
+                # `new_defer.callback()` call above.
+                if self.key_to_current_writer.get(key) == new_defer:
                     self.key_to_current_writer.pop(key)
 
         return _ctx_manager()