0461ef01b7
Merge pull request #3195 from matrix-org/erikj/pagination_refactor
...
Refactor recent events func to use pagination func
2018-05-09 14:12:24 +01:00
e2accd7f1d
Refactor sync APIs to reuse pagination API
...
The sync API often returns events in a topological rather than stream
ordering, e.g. when the user joined the room or on initial sync. When
this happens we can reuse existing pagination storage functions.
2018-05-09 13:43:39 +01:00
e5ab9cd24b
Don't unnecessarily require token to be stream token
...
This allows calling the `get_recent_event_ids_for_room` function in more
situations.
2018-05-09 11:58:35 +01:00
60590211c1
Merge pull request #3194 from rubo77/fix-nuke
...
nuke-room-from-db.sh: fix deletion from search table
2018-05-09 11:58:07 +01:00
c4af4c24ca
Refactor get_recent_events_for_room return type
...
There is no reason to return a tuple of tokens when the last token is
always the token passed as an argument. Changing it makes it consistent
with other storage APIs
2018-05-09 11:55:34 +01:00
05e0a2462c
Refactor pagination DB API to return concrete type
...
This makes it easier to document what is being returned by the storage
functions and what some functions expect as arguments.
2018-05-09 11:34:24 +01:00
7dd13415db
Remove unused from_token param
2018-05-09 10:58:16 +01:00
27cf170558
Refactor recent events func to use pagination func
...
This also removes a cache that is unlikely to ever get hit.
2018-05-09 10:55:55 +01:00
1aeb5e28a9
Merge pull request #3193 from matrix-org/erikj/pagination_refactor
...
Refactor /context to reuse pagination storage functions
2018-05-09 10:22:38 +01:00
23ec51c94c
Fix up comments and make function private
2018-05-09 09:55:19 +01:00
d5377eba55
Merge pull request #2337 from rubo77/patch-5
...
nuke-room-from-db.sh: added postgresql option and help
2018-05-09 09:43:07 +01:00
d11b8b6b65
nuke-room-from-db.sh: nuke from table event_search too
2018-05-09 00:46:47 +02:00
8ff8ab3bce
Dont nuke non-existing table event_search_content
2018-05-09 00:21:00 +02:00
6c957e26f0
nuke-room-from-db.sh: added postgresql option and help
2018-05-09 00:14:01 +02:00
696f532453
Reuse existing pagination code for context API
2018-05-08 16:20:19 +01:00
3e6d306e94
Parse tokens before calling DB function
2018-05-08 16:18:58 +01:00
274b8c6025
Only fetch required fields from database
2018-05-08 16:15:25 +01:00
06c0d0ed08
Split paginate_room_events storage function
2018-05-08 16:14:26 +01:00
bf98fa0864
Part user from rooms on account deactivate
...
This implements this very crudely: this probably isn't viable
because parting a user from all their rooms could take a long time,
and if the HS gets restarted in that time the process will be
aborted.
2018-05-08 15:58:35 +01:00
678e649b78
Merge pull request #3190 from mujx/notif-token-fix
...
notifications: Convert next_token to string according to the spec
2018-05-08 13:54:47 +01:00
0b7dfbb194
Merge pull request #3186 from matrix-org/erikj/fix_int_values_metrics
...
Fix metrics that have integer value labels
2018-05-08 09:48:50 +01:00
88868b2839
notifications: Convert next_token to string according to the spec
...
Currently the parameter is serialized as an integer.
Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
2018-05-05 12:55:02 +03:00
5addeaa02c
Add Docker packaging in the author list
2018-05-04 21:23:01 +02:00
6d8ec3462d
Note that label values can be anything
2018-05-03 16:25:05 +01:00
95b6912045
Fix metrics that have integer value labels
2018-05-03 15:51:04 +01:00
966686c845
Merge pull request #3007 from matrix-org/rav/warn_on_logcontext_fail
...
Make 'unexpected logging context' into warnings
2018-05-03 15:10:04 +01:00
093d8c415a
Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail
2018-05-03 14:59:29 +01:00
0ba609dc6f
Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaks
...
Fix logcontext leaks in rate limiter
2018-05-03 14:58:13 +01:00
2117f84323
Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdown
...
Fix 'Unhandled Error' logs with Twisted 18.4
2018-05-03 12:40:11 +01:00
a7fe62f0cb
Fix logcontext leaks in rate limiter
2018-05-03 12:31:59 +01:00
2e7a94c36b
Don't abortConnection() if the transport connection has already closed.
2018-05-03 12:31:47 +01:00
a2aaa9cb3c
Merge pull request #3178 from matrix-org/rav/fix_request_timeouts
...
fix http request timeout code
2018-05-03 11:33:26 +01:00
d72faf2fad
Fix changes warning
2018-05-03 10:56:42 +01:00
a0501ac57e
Warn of potential client incompatibility from #3161
2018-05-03 10:51:39 +01:00
0a3b51c420
Merge pull request #3141 from matrix-org/erikj/fixup_state
...
Refactor event storage to prepare for changes in state calculations
2018-05-03 10:39:20 +01:00
31c7c29d43
Fix up grammar
2018-05-03 10:38:58 +01:00
902673e356
Merge pull request #3161 from NotAFile/remove-v1auth
...
Make Client-Server API return 403 for invalid token
2018-05-03 10:10:57 +01:00
53a5fdf312
Merge pull request #3175 from matrix-org/erikj/escape_metric_values
...
Escape label values in prometheus metrics
2018-05-03 10:01:04 +01:00
1dfd650348
add missing param to cancelled_to_request_timed_out_error
...
This gets two arguments, not one.
2018-05-02 22:42:36 +01:00
9a779c2ddb
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
2018-05-02 20:22:41 +02:00
a41117c63b
Make _escape_character take MatchObject
2018-05-02 17:27:27 +01:00
32015e1109
Escape label values in prometheus metrics
2018-05-02 16:52:42 +01:00
3a42aed9a1
Merge pull request #3170 from matrix-org/rav/more_logcontext_leaks
...
Fix a class of logcontext leaks
2018-05-02 16:45:51 +01:00
5a0be97ab2
Merge pull request #3174 from matrix-org/rav/media_repo_logcontext_leaks
...
Fix logcontext leak in media repo
2018-05-02 16:43:04 +01:00
415c6b672e
Merge branch 'develop' into rav/more_logcontext_leaks
2018-05-02 16:16:01 +01:00
4e9bdeba57
Merge pull request #3172 from matrix-org/rav/fix_test_logcontext_leaks
...
Fix a couple of logcontext leaks in unit tests
2018-05-02 16:15:22 +01:00
be31adb036
Fix logcontext leak in media repo
...
Make FileResponder.write_to_consumer uphold the logcontext contract
2018-05-02 16:14:50 +01:00
11607006d9
Remove spurious unittest.DEBUG
2018-05-02 15:48:47 +01:00
46beeb9a30
Fix a couple of logcontext leaks in unit tests
...
... which were making other, innocent, tests, fail.
Plus remove a spurious unittest.DEBUG which was making the output noisy.
2018-05-02 15:46:22 +01:00
f22e7cda2c
Fix a class of logcontext leaks
...
So, it turns out that if you have a first `Deferred` `D1`, you can add a
callback which returns another `Deferred` `D2`, and `D2` must then complete
before any further callbacks on `D1` will execute (and later callbacks on `D1`
get the *result* of `D2` rather than `D2` itself).
So, `D1` might have `called=True` (as in, it has started running its
callbacks), but any new callbacks added to `D1` won't get run until `D2`
completes - so if you `yield D1` in an `inlineCallbacks` function, your `yield`
will 'block'.
In conclusion: some of our assumptions in `logcontext` were invalid. We need to
make sure that we don't optimise out the logcontext juggling when this
situation happens. Fortunately, it is easy to detect by checking `D1.paused`.
2018-05-02 11:58:00 +01:00
Erik Johnston