diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-03-17 12:33:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 12:33:18 +0000 |
| commit | 567f88f835a55d2241cc129ac44b8b0dcedfa6e2 (patch) | |
| tree | 0f21914aebcaef0735edb3a585b200e0651edb90 /synapse/replication/http/federation.py | |
| parent | Add type hints to the room member handler. (#9631) (diff) | |
| download | synapse-567f88f835a55d2241cc129ac44b8b0dcedfa6e2.tar.xz | |
Prep work for removing `outlier` from `internal_metadata` (#9411)
* Populate `internal_metadata.outlier` based on `events` table Rather than relying on `outlier` being in the `internal_metadata` column, populate it based on the `events.outlier` column. * Move `outlier` out of InternalMetadata._dict Ultimately, this will allow us to stop writing it to the database. For now, we have to grandfather it back in so as to maintain compatibility with older versions of Synapse.
Diffstat (limited to 'synapse/replication/http/federation.py')
| -rw-r--r-- | synapse/replication/http/federation.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/replication/http/federation.py b/synapse/replication/http/federation.py index 8af53b4f28..82ea3b895f 100644 --- a/synapse/replication/http/federation.py +++ b/synapse/replication/http/federation.py @@ -40,6 +40,7 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint): // containing the event "event_format_version": .., // 1,2,3 etc: the event format version "internal_metadata": { .. serialized internal_metadata .. }, + "outlier": true|false, "rejected_reason": .., // The event.rejected_reason field "context": { .. serialized event context .. }, }], @@ -84,6 +85,7 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint): "room_version": event.room_version.identifier, "event_format_version": event.format_version, "internal_metadata": event.internal_metadata.get_dict(), + "outlier": event.internal_metadata.is_outlier(), "rejected_reason": event.rejected_reason, "context": serialized_context, } @@ -116,6 +118,7 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint): event = make_event_from_dict( event_dict, room_ver, internal_metadata, rejected_reason ) + event.internal_metadata.outlier = event_payload["outlier"] context = EventContext.deserialize( self.storage, event_payload["context"] |