summary refs log tree commit diff
path: root/synapse/replication
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-03-30 17:19:56 +0100
committerMark Haines <mark.haines@matrix.org>2016-03-30 17:19:56 +0100
commit1fbb094c6fbaab33ef8e17802e37057e83718e7e (patch)
tree602b841ceb262e658ddfb8c11a2462cbffee16f2 /synapse/replication
parentAdd a entry to current_state_resets table when the current state is reset (diff)
downloadsynapse-1fbb094c6fbaab33ef8e17802e37057e83718e7e.tar.xz
Add replication streams for ex outliers and current state resets
Diffstat (limited to 'synapse/replication')
-rw-r--r--synapse/replication/resource.py17
1 files changed, 16 insertions, 1 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py
index 096a79a7a4..7afa1242d5 100644
--- a/synapse/replication/resource.py
+++ b/synapse/replication/resource.py
@@ -204,7 +204,11 @@ class ReplicationResource(Resource):
                 request_events = current_token.events
             if request_backfill is None:
                 request_backfill = current_token.backfill
-            events_rows, backfill_rows = yield self.store.get_all_new_events(
+            (
+                events_rows, backfill_rows,
+                forward_ex_outliers, backward_ex_outliers,
+                state_resets
+            ) = yield self.store.get_all_new_events(
                 request_backfill, request_events,
                 current_token.backfill, current_token.events,
                 limit
@@ -215,6 +219,17 @@ class ReplicationResource(Resource):
             writer.write_header_and_rows("backfill", backfill_rows, (
                 "position", "internal", "json", "state_group"
             ))
+            writer.write_header_and_rows(
+                "forward_ex_outliers", forward_ex_outliers,
+                ("position", "event_id", "state_group")
+            )
+            writer.write_header_and_rows(
+                "backward_ex_outliers", backward_ex_outliers,
+                ("position", "event_id", "state_group")
+            )
+            writer.write_header_and_rows(
+                "state_resets", state_resets, ("position",)
+            )
 
     @defer.inlineCallbacks
     def presence(self, writer, current_token):