/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

Split out federation transaction sending to a worker #1635

Merged
merged 22 commits into from Nov 23, 2016

Conversation

Reviewers

@NegativeMjark NegativeMjark

Assignees

@NegativeMjark NegativeMjark

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

erikjohnston commented Nov 21, 2016 • edited

No description provided.

erikjohnston added some commits Nov 4, 2016

@erikjohnston
Add initial cut of federation send queue

Some checks were not successful

1 errored, 2 pending, and 2 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1121 origin/erikj/split_out_fed_txn failed in 13 sec
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #2054 in progress...
Details
@matrixbot
Unit Tests (Commit) — Build #2085 in progress...
Details
@matrixbot
Sytest Postgres (Commit) — Build #1960 origin/erikj/split_out_fed_txn succeeded in 8 min 22 sec
Details
@matrixbot
Sytest SQLite (Commit) — Build #2005 origin/erikj/split_out_fed_txn succeeded in 6 min 18 sec
Details
1587b5a
@erikjohnston
Rename transaction queue functions to send_*
0e830d3
@erikjohnston
Move logic into transaction_queue
daec6fc
@erikjohnston
Add transaction queue and transport layer to DI
847d5db
@erikjohnston
Use new federation_sender DI
59ef517
@erikjohnston
Hook up the send queue and create a federation sender worker
ed787cf
@erikjohnston
Handle sending events and device messages over federation
f8ee662
@erikjohnston
Store federation stream positions in the database
7c9cdb2
@erikjohnston
Fix tests

Some checks were not successful

1 errored, 1 failing, and 8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1127 origin/erikj/split_out_fed_txn failed in 2 min 20 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #2060 origin/erikj/split_out_fed_txn succeeded in 51 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1966 origin/erikj/split_out_fed_txn succeeded in 10 min
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2011 origin/erikj/split_out_fed_txn succeeded in 6 min 52 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #2091 origin/erikj/split_out_fed_txn succeeded in 3 min 24 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
524d61b

@erikjohnston erikjohnston changed the title from Erikj/split out fed txn to Split out federation transaction sending to a worker Nov 21, 2016

erikjohnston added some commits Nov 21, 2016

@erikjohnston
Remove explicit calls to send_pdu

Some checks were not successful

1 errored, 2 failing, and 7 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1130 origin/erikj/split_out_fed_txn failed in 1 min 27 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #2063 origin/erikj/split_out_fed_txn succeeded in 44 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1969 origin/erikj/split_out_fed_txn succeeded in 8 min 2 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2014 origin/erikj/split_out_fed_txn succeeded in 8 min 9 sec
Details
@matrixbot
Unit Tests (Commit) — Build #2094 origin/erikj/split_out_fed_txn succeeded in 3 min 1 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
9687e03
@erikjohnston
Comments

Some checks were not successful

1 errored, 2 failing, and 7 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1131 origin/erikj/split_out_fed_txn failed in 2 min 24 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #2064 origin/erikj/split_out_fed_txn succeeded in 1 min 29 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1970 origin/erikj/split_out_fed_txn succeeded in 7 min 27 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2015 origin/erikj/split_out_fed_txn succeeded in 5 min 51 sec
Details
@matrixbot
Unit Tests (Commit) — Build #2095 origin/erikj/split_out_fed_txn succeeded in 2 min 42 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
50934ce
@erikjohnston
Add some metrics

Some checks were not successful

2 failing and 4 successful checks
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #2096 origin/erikj/split_out_fed_txn succeeded in 2 min 17 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
88d85eb
@erikjohnston
Add federation-sender to sytest

Some checks were not successful

1 errored, 1 failing, and 8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1133 origin/erikj/split_out_fed_txn failed in 2 min 20 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #2065 origin/erikj/split_out_fed_txn succeeded in 47 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1972 origin/erikj/split_out_fed_txn succeeded in 8 min 8 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2017 origin/erikj/split_out_fed_txn succeeded in 6 min 10 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #2097 origin/erikj/split_out_fed_txn succeeded in 3 min 49 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
73dc099

@erikjohnston erikjohnston assigned NegativeMjark Nov 21, 2016

This was referenced Nov 21, 2016

Merged
Merged
synapse/federation/send_queue.py
+
+ # There should be only one reader, so lets delete everything its
+ # acknowledged its seen.
+ self._clear_queue_before_pos(token)
@NegativeMjark

NegativeMjark Nov 21, 2016

Contributor

Might be worth trying to use a separate parameter for controlling the acks. For example there's a script in scripts-dev that tails all replication rows, if you ran it againtst synapse it might inadvertently delete all the federation queues. That could be awkward.

If you used a separate parameter for acknowledging like ack_federation or something and didn't report it in the list of streams then I don't think this would be such a problem.

Although it might be that case that we are better off not exposing the federation in the list of streams.

@erikjohnston
Comments

Some checks were not successful

1 errored, 1 failing, and 8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1137 origin/erikj/split_out_fed_txn failed in 14 min
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #2069 origin/erikj/split_out_fed_txn succeeded in 35 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1974 origin/erikj/split_out_fed_txn succeeded in 10 min
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2019 origin/erikj/split_out_fed_txn succeeded in 6 min 40 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #2100 origin/erikj/split_out_fed_txn succeeded in 2 min 12 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
51e8970
synapse/federation/send_queue.py
+ else:
+ self.edus[pos] = edu
+
+ def send_presence(self, destination, states):
@NegativeMjark

NegativeMjark Nov 21, 2016

Contributor

I wonder if we send lots of identical messages to multiple dests. I wonder if it might be possible to reduce the duplication here if that is the case.

@erikjohnston

erikjohnston Nov 23, 2016

Owner

Probably, but I think that can be dealt with later if necessary.

erikjohnston added some commits Nov 22, 2016

@erikjohnston
Invalidate retry cache in both directions

Some checks were not successful

3 errored, 4 failing, and 3 successful checks
@matrixbot
Flake8 + Packaging (Commit) — Build #2080 origin/erikj/split_out_fed_txn failed in 1 min 21 sec
Details
@matrixbot
Sytest Dendron (Commit) — Build #1146 origin/erikj/split_out_fed_txn failed in 13 min
Details
@matrixbot
Unit Tests (Commit) — Build #2111 origin/erikj/split_out_fed_txn failed in 2 min 56 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1983 origin/erikj/split_out_fed_txn succeeded in 9 min 31 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2029 origin/erikj/split_out_fed_txn succeeded in 6 min 26 sec
Details
90565d0
@erikjohnston
Fix tests and flake8

Some checks were not successful

1 errored, 1 failing, and 8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1147 origin/erikj/split_out_fed_txn failed in 17 min
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #2081 origin/erikj/split_out_fed_txn succeeded in 36 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1984 origin/erikj/split_out_fed_txn succeeded in 10 min
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2030 origin/erikj/split_out_fed_txn succeeded in 6 min 52 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #2112 origin/erikj/split_out_fed_txn succeeded in 2 min 38 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
54fed21
@erikjohnston
Explicit federation ack

Some checks were not successful

1 errored, 1 failing, and 8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1148 origin/erikj/split_out_fed_txn failed in 2 min 11 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #2082 origin/erikj/split_out_fed_txn succeeded in 49 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1985 origin/erikj/split_out_fed_txn succeeded in 8 min 30 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2031 origin/erikj/split_out_fed_txn succeeded in 9 min 3 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #2113 origin/erikj/split_out_fed_txn succeeded in 3 min 58 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
4c79a63
@erikjohnston
Comment

Some checks were not successful

1 errored, 1 failing, and 8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1150 origin/erikj/split_out_fed_txn failed in 16 min
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #2084 origin/erikj/split_out_fed_txn succeeded in 1 min 5 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1987 origin/erikj/split_out_fed_txn succeeded in 7 min 20 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2033 origin/erikj/split_out_fed_txn succeeded in 5 min 25 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #2115 origin/erikj/split_out_fed_txn succeeded in 2 min 32 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
4d9b5c6
@erikjohnston
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sp… 
…lit_out_fed_txn
b69f76c
@erikjohnston
Ensure only main or federation_sender process can send federation tra… 
…ffic
26072df
@erikjohnston
Fix tests

Some checks were not successful

1 errored, 1 failing, and 8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1151 origin/erikj/split_out_fed_txn failed in 3 min 15 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #2085 origin/erikj/split_out_fed_txn succeeded in 42 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1988 origin/erikj/split_out_fed_txn succeeded in 9 min 33 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2034 origin/erikj/split_out_fed_txn succeeded in 7 min 19 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #2116 origin/erikj/split_out_fed_txn succeeded in 3 min 8 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
ee5e8d7
@erikjohnston
Owner

erikjohnston commented Nov 23, 2016

@NegativeMjark PTAL
@erikjohnston
Shuffle receipt handler around so that worker apps don't need to load it

Some checks were not successful

1 errored, 1 failing, and 8 successful checks
@matrixbot
Sytest SQLite (Commit) — Build #2035 origin/erikj/split_out_fed_txn failed in 8 min 50 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #2086 origin/erikj/split_out_fed_txn succeeded in 40 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Dendron (Commit) — Build #1152 origin/erikj/split_out_fed_txn succeeded in 10 min
Details
@matrixbot
Sytest Postgres (Commit) — Build #1989 origin/erikj/split_out_fed_txn succeeded in 6 min 50 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #2117 origin/erikj/split_out_fed_txn succeeded in 2 min 18 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
feec718

@erikjohnston erikjohnston merged commit 302fbd2 into develop Nov 23, 2016
8 of 10 checks passed

8 of 10 checks passed

Sytest SQLite (Commit) Build #2035 origin/erikj/split_out_fed_txn failed in 8 min 50 sec
Details
Sytest Dendron (Merged PR) Build finished.
Details
Flake8 + Packaging (Commit) Build #2086 origin/erikj/split_out_fed_txn succeeded in 40 sec
Details
Flake8 + Packaging (Merged PR) Build finished.
Details
Sytest Dendron (Commit) Build #1152 origin/erikj/split_out_fed_txn succeeded in 10 min
Details
Sytest Postgres (Commit) Build #1989 origin/erikj/split_out_fed_txn succeeded in 6 min 50 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Merged PR) Build finished.
Details
Unit Tests (Commit) Build #2117 origin/erikj/split_out_fed_txn succeeded in 2 min 18 sec
Details
Unit Tests (Merged PR) Build finished.
Details

@richvdh richvdh deleted the erikj/split_out_fed_txn branch Dec 1, 2016

@NegativeMjark NegativeMjark referenced this pull request Jan 5, 2017

Closed

Synapse is sending non-local events over federation #1753

NegativeMjark added a commit that referenced this pull request Jan 5, 2017

@NegativeMjark
Only send events that originate on this server. 
Or events that are sent via the federation "send_join" API.

This should match the behaviour from before v0.18.5 and #1635 landed.

Some checks were not successful

1 errored, 1 failing, and 6 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #1301 origin/markjh/fix_send_pdu failed in 1 min 16 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #2144 origin/markjh/fix_send_pdu succeeded in 7 min 58 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2186 origin/markjh/fix_send_pdu succeeded in 6 min 44 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
f784980

@NegativeMjark NegativeMjark referenced this pull request Jan 5, 2017

Merged

Only send events that originate on this server. #1764

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