24efb2a70d
Fix timeout function
...
Turns out deferred.cancel sometimes throws, so we do that last to ensure
that we always do resolve the new deferred.
2018-09-15 11:38:39 +01:00
c30cfff572
Merge pull request #3875 from matrix-org/erikj/extra_timeouts
...
Add an awful secondary timeout to fix wedged requests
2018-09-14 19:56:11 +01:00
335b23a078
Newsfile
2018-09-14 19:25:58 +01:00
fcfe7a850d
Add an awful secondary timeout to fix wedged requests
...
This is an attempt to mitigate #3842 by adding yet-another-timeout
2018-09-14 19:23:07 +01:00
024be6cf18
don't filter membership events based on history visibility ( #3874 )
...
don't filter membership events based on history visibility
as we will already have filtered the messages in the timeline, and state events
are always visible.
and because @erikjohnston said so.
2018-09-14 18:12:52 +01:00
3e6e94fe9f
Merge pull request #3872 from matrix-org/hawkowl/timeouts-2
...
timeouts 2: electric boogaloo
2018-09-14 16:58:44 +01:00
8b3652831c
Merge pull request #3871 from matrix-org/erikj/in_flight_block_metrics
...
Add in flight real time metrics for Measure blocks
2018-09-14 16:40:31 +01:00
bc9af88a2d
fix
2018-09-15 00:26:00 +10:00
90f8e606e2
changelog
2018-09-15 00:23:55 +10:00
d0f6c1ce21
Remove spurious comment
2018-09-14 15:12:36 +01:00
9e2f9a7b57
Measure outbound requests
2018-09-14 15:11:26 +01:00
941ac0f085
Newsfile
2018-09-14 15:08:37 +01:00
f6e82dcddb
Tests
2018-09-14 15:08:37 +01:00
0a81038ea0
Add in flight real time metrics for Measure blocks
2018-09-14 15:08:37 +01:00
ad9198cc34
Merge pull request #3860 from matrix-org/travis/typo-1
...
Fix minor typo in exception
2018-09-13 16:32:48 -06:00
984db8bb08
Create 3860.misc
2018-09-13 12:06:04 -06:00
c971aa7b9d
fix
2018-09-14 03:57:02 +10:00
8f08d848f5
fix
2018-09-14 03:53:56 +10:00
f1a7264663
Fix minor typo in exception
2018-09-13 11:51:12 -06:00
7c33ab76da
redact better
2018-09-14 03:45:34 +10:00
63755fa4c2
we do that higher up
2018-09-14 03:21:47 +10:00
73884ebac5
Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2
2018-09-14 03:11:25 +10:00
7c27c4d51c
merge ( #3576 )
2018-09-14 03:11:11 +10:00
1c3f4d9ca5
buffer?
2018-09-14 03:09:13 +10:00
6c0f8d9d50
Merge pull request #3856 from matrix-org/erikj/speed_up_purge
...
Make purge history slightly faster
2018-09-13 16:14:46 +01:00
ed5331a627
comment
2018-09-13 16:10:56 +01:00
cb64fe2cb7
Merge pull request #3859 from matrix-org/erikj/add_iterkeys
...
Fix handling of redacted events from federation
2018-09-14 01:06:44 +10:00
13193a6e2b
Newsfile
2018-09-13 15:46:45 +01:00
3126b88d35
fix circleci merged builds ( #3858 )
...
* fix
* changelog
2018-09-14 00:44:31 +10:00
89a76d1889
Fix handling of redacted events from federation
...
If we receive an event that doesn't pass their content hash check (e.g.
due to already being redacted) then we hit a bug which causes an
exception to be raised, which then promplty stops the event (and
request) from being processed.
This effects all sorts of federation APIs, including joining rooms with
a redacted state event.
2018-09-13 15:44:12 +01:00
bfa0b759e0
Attempt to figure out what's going on with timeouts ( #3857 )
2018-09-14 00:15:51 +10:00
9cbd0094f0
pep8
2018-09-13 15:15:35 +01:00
9dbe38ea7d
Create indices after insertion
2018-09-13 15:05:52 +01:00
93139a1fb8
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_purge
2018-09-13 12:57:09 +01:00
e7cd7cb0f0
Newsfile
2018-09-13 12:55:40 +01:00
c857f5ef9b
Make purge history slightly faster
...
Don't pull out events that are outliers and won't be deleted, as nothing
should happen to them.
2018-09-13 12:48:10 +01:00
b7d2fb5eb9
Remove some superfluous logging ( #3855 )
2018-09-13 19:59:32 +10:00
f30a303590
Merge pull request #3846 from matrix-org/neilj/expose-registered-users
...
expose number of real reserved users
2018-09-12 17:14:04 +01:00
2ac1abbc7e
show heroes if a room has a 'deleted' name/canonical_alias ( #3851 )
2018-09-12 17:11:05 +01:00
fa0d464fa4
Merge pull request #3853 from matrix-org/erikj/log_outbound_each_time
...
Log outbound requests when we retry
2018-09-12 16:55:40 +01:00
0403cf0783
argh pep8
2018-09-12 16:54:28 +01:00
0e200e366d
correctly log gappy sync metrics
2018-09-12 16:47:20 +01:00
11bfc2af1c
fix logline
2018-09-12 16:45:42 +01:00
3db016b641
Newsfile
2018-09-12 16:25:18 +01:00
8decd6233d
improve naming
2018-09-12 16:22:15 +01:00
8c5b84441b
Log outbound requests when we retry
2018-09-12 16:22:14 +01:00
54f8616d2c
Merge pull request #3841 from matrix-org/erikj/manhole_key_length
...
Change the manhole SSH key to have more bits
2018-09-12 14:33:39 +01:00
65cd8ccc79
Add JUnit summaries to CircleCI as well as merged runs ( #3704 )
2018-09-12 23:29:21 +10:00
7ca097f77e
Port federation/ to py3 ( #3847 )
2018-09-12 23:23:32 +10:00
5cea4e16c7
towncrier
2018-09-12 12:03:31 +01:00
Erik Johnston