Always run txn.after_callbacks

synapse/storage/_base.py

@@ -305,13 +305,14 @@ class SQLBaseStore(object):
                     func, *args, **kwargs
                 )
 
-        with PreserveLoggingContext():
+        try:
-            result = yield self._db_pool.runWithConnection(
+            with PreserveLoggingContext():
-                inner_func, *args, **kwargs
+                result = yield self._db_pool.runWithConnection(
-            )
+                    inner_func, *args, **kwargs
-
+                )
-        for after_callback, after_args in after_callbacks:
+        finally:
-            after_callback(*after_args)
+            for after_callback, after_args in after_callbacks:
+                after_callback(*after_args)
         defer.returnValue(result)
 
     @defer.inlineCallbacks