/synapse

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Don't double encode replication data #2103

Merged
merged 3 commits into from Apr 7, 2017
+88 −47

Conversation

Reviewers

@richvdh richvdh

Assignees

@erikjohnston erikjohnston

Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@erikjohnston @richvdh
@erikjohnston
Owner

erikjohnston commented Apr 5, 2017

No description provided.

erikjohnston added some commits Apr 5, 2017

@erikjohnston
Don't double json encode federation replication data
f10ce89
@erikjohnston
Don't double json encode typing replication data

All checks have passed

8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1902 origin/erikj/no-double-encode succeeded in 8 min 10 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #2731 origin/erikj/no-double-encode succeeded in 7 min 3 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2802 origin/erikj/no-double-encode succeeded in 5 min 39 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
96b9b6c

@erikjohnston erikjohnston assigned richvdh Apr 5, 2017

@richvdh

richvdh requested changes Apr 6, 2017
View changes

plausible, but help me out here: can you give example of the tcp traffic before and after the change, please.

The fact that you can do this without updating any documentation tells me that we need some documentation.

@richvdh richvdh assigned erikjohnston and unassigned richvdh Apr 6, 2017

@erikjohnston
Document types of the replication streams

All checks have passed

8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1913 origin/erikj/no-double-encode succeeded in 8 min 48 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #2742 origin/erikj/no-double-encode succeeded in 8 min 7 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2812 origin/erikj/no-double-encode succeeded in 6 min 9 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
ad544c8
@erikjohnston
Owner

erikjohnston commented Apr 6, 2017

Typing:

RDATA typing 236351 ["!foo:bar.org","[\"@e:matrix.org\"]"]

to

RDATA typing 236351 ["!foo:bar.org",["@e:matrix.org"]]

Federation:

RDATA federation 2132609 ["p","{\"state\":{\"last_federation_update_ts\":1491218944668,\"state\":\"offline\",\"user_id\":\"@_snoonet_MadPierrot:matrix.org\",\"last_user_sync_ts\":0,\"last_active_ts\":1491218911377,\"status_msg\":null,\"currently_active\":true},\"destination\":\"matrix.org\"}"]

to

RDATA federation 2132609 ["p",{"state":{"last_federation_update_ts":1491218944668,"state":"offline","user_id":"@_snoonet_MadPierrot:matrix.org","last_user_sync_ts":0,"last_active_ts":1491218911377,"status_msg":null,"currently_active":true},"destination":"matrix.org"}"]
@erikjohnston
Owner

erikjohnston commented Apr 6, 2017

I've also commented on the types of each stream row (though admittedly not what they represent)

@erikjohnston erikjohnston assigned richvdh and unassigned erikjohnston Apr 6, 2017

@richvdh

richvdh approved these changes Apr 6, 2017
View changes

lgtm

@richvdh richvdh assigned erikjohnston and unassigned richvdh Apr 6, 2017

@erikjohnston erikjohnston merged commit 98ce212 into develop Apr 7, 2017
8 checks passed

8 checks passed

Sytest Dendron (Commit) Build #1913 origin/erikj/no-double-encode succeeded in 8 min 48 sec
Details
Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #2742 origin/erikj/no-double-encode succeeded in 8 min 7 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #2812 origin/erikj/no-double-encode succeeded in 6 min 9 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

psaavedra added a commit to psaavedra/synapse that referenced this pull request May 19, 2017

@psaavedra
Merge tag 'v0.21.0' into v0.21.0_no_federate_by_default 
Changes in synapse v0.21.0 (2017-05-18)
=======================================

No changes since v0.21.0-rc3

Changes in synapse v0.21.0-rc3 (2017-05-17)
===========================================

Features:

* Add per user rate-limiting overrides (PR #2208)
* Add config option to limit maximum number of events requested by ``/sync``
  and ``/messages`` (PR #2221) Thanks to @psaavedra!

Changes:

* Various small performance fixes (PR #2201, #2202, #2224, #2226, #2227, #2228,
  #2229)
* Update username availability checker API (PR #2209, #2213)
* When purging, don't de-delta state groups we're about to delete (PR #2214)
* Documentation to check synapse version (PR #2215) Thanks to @hamber-dick!
* Add an index to event_search to speed up purge history API (PR #2218)

Bug fixes:

* Fix API to allow clients to upload one-time-keys with new sigs (PR #2206)

Changes in synapse v0.21.0-rc2 (2017-05-08)
===========================================

Changes:

* Always mark remotes as up if we receive a signed request from them (PR #2190)

Bug fixes:

* Fix bug where users got pushed for rooms they had muted (PR #2200)

Changes in synapse v0.21.0-rc1 (2017-05-08)
===========================================

Features:

* Add username availability checker API (PR #2183)
* Add read marker API (PR #2120)

Changes:

* Enable guest access for the 3pl/3pid APIs (PR #1986)
* Add setting to support TURN for guests (PR #2011)
* Various performance improvements (PR #2075, #2076, #2080, #2083, #2108,
  #2158, #2176, #2185)
* Make synctl a bit more user friendly (PR #2078, #2127) Thanks @APwhitehat!
* Replace HTTP replication with TCP replication (PR #2082, #2097, #2098,
  #2099, #2103, #2014, #2016, #2115, #2116, #2117)
* Support authenticated SMTP (PR #2102) Thanks @DanielDent!
* Add a counter metric for successfully-sent transactions (PR #2121)
* Propagate errors sensibly from proxied IS requests (PR #2147)
* Add more granular event send metrics (PR #2178)

Bug fixes:

* Fix nuke-room script to work with current schema (PR #1927) Thanks
  @zuckschwerdt!
* Fix db port script to not assume postgres tables are in the public schema
  (PR #2024) Thanks @jerrykan!
* Fix getting latest device IP for user with no devices (PR #2118)
* Fix rejection of invites to unreachable servers (PR #2145)
* Fix code for reporting old verify keys in synapse (PR #2156)
* Fix invite state to always include all events (PR #2163)
* Fix bug where synapse would always fetch state for any missing event (PR #2170)
* Fix a leak with timed out HTTP connections (PR #2180)
* Fix bug where we didn't time out HTTP requests to ASes  (PR #2192)

Docs:

* Clarify doc for SQLite to PostgreSQL port (PR #1961) Thanks @benhylau!
* Fix typo in synctl help (PR #2107) Thanks @HarHarLinks!
* ``web_client_location`` documentation fix (PR #2131) Thanks @matthewjwolff!
* Update README.rst with FreeBSD changes (PR #2132) Thanks @feld!
* Clarify setting up metrics (PR #2149) Thanks @encks!
badd30b

@richvdh richvdh referenced this pull request Oct 16, 2017

Closed

Content repo should restrict access to users who can read the associated event (SYN-503) #1403

@erikjohnston erikjohnston deleted the erikj/no-double-encode branch Oct 26, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment