Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changelog | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
| | |||||
* | Create the column nullable | Richard van der Hoff | 2018-07-26 | 2 | -9/+13 |
| | | | | | There's no real point in ever making the column non-nullable, and doing so breaks the sytests. | ||||
* | Stop populating events.content | Richard van der Hoff | 2018-07-26 | 2 | -1/+93 |
| | | | | | | This field is no longer read from, so we should stop populating it. Once we're happy that this doesn't break everything, and a rollback is unlikely, we can think about dropping the column. | ||||
* | comment on event_edges | Richard van der Hoff | 2018-07-26 | 1 | -1/+2 |
| | |||||
* | Merge pull request #2970 from matrix-org/matthew/filter_members | Matthew Hodgson | 2018-07-26 | 5 | -62/+532 |
|\ | | | | | Implement the lazy_load_members room state filter parameter | ||||
| * | switch missing_types to be a bool | Matthew Hodgson | 2018-07-25 | 1 | -4/+4 |
| | | |||||
| * | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-25 | 34 | -238/+389 |
| |\ | |||||
| * | | flake8 | Matthew Hodgson | 2018-07-25 | 1 | -12/+12 |
| | | | |||||
| * | | add tests for _get_some_state_from_cache | Matthew Hodgson | 2018-07-25 | 1 | -0/+150 |
| | | | |||||
| * | | incorporate more review. | Matthew Hodgson | 2018-07-25 | 1 | -16/+14 |
| | | | |||||
| * | | handle the edge case for _get_some_state_from_cache where types is [] | Matthew Hodgson | 2018-07-24 | 1 | -1/+7 |
| | | | |||||
| * | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 2 | -12/+5 |
| |\ \ | |||||
| * | | | clarify comment on p_ids | Matthew Hodgson | 2018-07-24 | 1 | -1/+2 |
| | | | | |||||
| * | | | consider non-filter_type types as wildcards, thus missing from the ↵ | Matthew Hodgson | 2018-07-24 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | state-group-cache | ||||
| * | | | rather than adding ll_ids, remove them from p_ids | Matthew Hodgson | 2018-07-24 | 1 | -5/+6 |
| | | | | |||||
| * | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 17 | -316/+416 |
| |\ \ \ | |||||
| * | | | | incorporate more review | Matthew Hodgson | 2018-07-24 | 3 | -30/+27 |
| | | | | | |||||
| * | | | | handle case where types is [] on postgres correctly | Matthew Hodgson | 2018-07-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | changelog | Matthew Hodgson | 2018-07-23 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 53 | -3241/+3681 |
| |\ \ \ \ | |||||
| * | | | | | incorporate review | Matthew Hodgson | 2018-07-23 | 2 | -52/+35 |
| | | | | | | |||||
| * | | | | | make test work | Matthew Hodgson | 2018-07-19 | 1 | -37/+46 |
| | | | | | | |||||
| * | | | | | first cut of a UT for testing state store (untested) | Matthew Hodgson | 2018-07-19 | 1 | -0/+151 |
| | | | | | | |||||
| * | | | | | fix thinkos; unbreak tests | Matthew Hodgson | 2018-07-19 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | incorporate review | Matthew Hodgson | 2018-07-19 | 2 | -20/+31 |
| | | | | | | |||||
| * | | | | | add a filtered_types param to limit filtering to specific types | Matthew Hodgson | 2018-07-19 | 2 | -82/+96 |
| | | | | | | |||||
| * | | | | | merge develop pydoc for _get_state_for_groups | Matthew Hodgson | 2018-07-19 | 370 | -3768/+6264 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-10 | 28 | -178/+531 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 59 | -181/+496 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | more comments | Matthew Hodgson | 2018-06-04 | 1 | -0/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | add lazy_load_members to the filter json schema | Matthew Hodgson | 2018-05-29 | 1 | -1/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | pep8 | Matthew Hodgson | 2018-05-29 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | disable CPUMetrics if no /proc/self/stat | Matthew Hodgson | 2018-05-29 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes build on macOS again | ||||
| * | | | | | | | | fix dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | add pydoc | Matthew Hodgson | 2018-05-29 | 2 | -27/+67 |
| | | | | | | | | | |||||
| * | | | | | | | | merge develop | Matthew Hodgson | 2018-05-29 | 242 | -3342/+7386 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | make lazy_load_members configurable in filters | Matthew Hodgson | 2018-03-19 | 2 | -9/+15 |
| | | | | | | | | | | |||||
| * | | | | | | | | | reshuffle todo & comments | Matthew Hodgson | 2018-03-19 | 1 | -2/+10 |
| | | | | | | | | | | |||||
| * | | | | | | | | | only get member state IDs for incremental syncs if we're filtering | Matthew Hodgson | 2018-03-18 | 1 | -5/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | remove stale import | Matthew Hodgson | 2018-03-16 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | remove debug | Matthew Hodgson | 2018-03-16 | 1 | -4/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fix tsm search again | Matthew Hodgson | 2018-03-16 | 1 | -5/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | add state_ids for timeline entries | Matthew Hodgson | 2018-03-16 | 1 | -4/+14 |
| | | | | | | | | | | |||||
| * | | | | | | | | | simplify timeline_start_members | Matthew Hodgson | 2018-03-16 | 1 | -14/+13 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Replace some ujson with simplejson to make it work | Erik Johnston | 2018-03-16 | 4 | -4/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | make incr syncs work | Matthew Hodgson | 2018-03-16 | 1 | -3/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-03-14 | 10 | -144/+711 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pep8 | Matthew Hodgson | 2018-03-14 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | add copyright to nudge CI | Matthew Hodgson | 2018-03-14 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | oops | Matthew Hodgson | 2018-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | make it work | Matthew Hodgson | 2018-03-13 | 2 | -7/+9 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | remove comment now #2969 is fixed | Matthew Hodgson | 2018-03-13 | 1 | -6/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | merge proper fix to bug 2969 | Matthew Hodgson | 2018-03-13 | 46 | -336/+576 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | typoe | Matthew Hodgson | 2018-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | disable optimisation for searching for state groups | Matthew Hodgson | 2018-03-13 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when type filter includes wildcards on state_key | ||||
| | * | | | | | | | | | | build where_clause sanely | Matthew Hodgson | 2018-03-13 | 1 | -6/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | PR feedbackz | Matthew Hodgson | 2018-03-13 | 1 | -3/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | fix bug #2926 | Matthew Hodgson | 2018-03-13 | 1 | -4/+17 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | ensure we always include the members for a given timeline block | Matthew Hodgson | 2018-03-13 | 1 | -4/+32 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | correctly handle None state_keys | Matthew Hodgson | 2018-03-12 | 1 | -10/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and fix include_other_types thinko | ||||
| * | | | | | | | | | | | fix sqlite where clause | Matthew Hodgson | 2018-03-12 | 1 | -2/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | typos | Matthew Hodgson | 2018-03-11 | 2 | -2/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | WIP experiment in lazyloading room members | Matthew Hodgson | 2018-03-11 | 2 | -17/+73 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3609 from matrix-org/travis/doc-typo-2 | Travis Ralston | 2018-07-25 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | Fix a minor documentation typo in on_make_leave | ||||
| * | | | | | | | | | | | Create 3609.misc | Travis Ralston | 2018-07-25 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix a minor documentation typo in on_make_leave | Travis Ralston | 2018-07-25 | 1 | -1/+1 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3603 from matrix-org/erikj/handle_outliers | Erik Johnston | 2018-07-25 | 2 | -6/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Correctly handle outliers during persist events | ||||
| * | | | | | | | | | | | Actually fix it by adding continue | Erik Johnston | 2018-07-25 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix typo in conditional | Erik Johnston | 2018-07-25 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-25 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Correctly handle outliers during persist events | Erik Johnston | 2018-07-25 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We incorrectly asserted that all contexts must have a non None state group without consider outliers. This would usually be fine as the assertion would never be hit, as there is a shortcut during persistence if the forward extremities don't change. However, if the outlier is being persisted with non-outlier events, the function would be called and the assertion would be hit. Fixes #3601 | ||||
* | | | | | | | | | | | | Merge pull request #3606 from matrix-org/rav/logcontext_fixes_once_more | Richard van der Hoff | 2018-07-25 | 3 | -5/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix another logcontext leak in _persist_events | ||||
| * | | | | | | | | | | | | Fix another logcontext leak in _persist_events | Richard van der Hoff | 2018-07-25 | 3 | -5/+11 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to run the errback in the sentinel context to avoid losing our own context. Also: add logging to runInteraction to help identify where "Starting db connection from sentinel context" warnings are coming from | ||||
* | | | | | | | | | | | | Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_error | Richard van der Hoff | 2018-07-25 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix occasional 'tuple index out of range' error | ||||
| * | | | | | | | | | | | | Fix occasional 'tuple index out of range' error | Richard van der Hoff | 2018-07-25 | 2 | -1/+2 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug in _delete_existing_rows_txn which was introduced in #3435 (though it's been on matrix-org-hotfixes for *years*). This code is only called when there is some sort of conflict the first time we try to persist an event, so it only happens rarely. Still, the exceptions are annoying. | ||||
* | | | | | | | | | | | | Merge pull request #3605 from matrix-org/rav/fix_update_remote_profile_cache | Richard van der Hoff | 2018-07-25 | 2 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix updating of cached remote profiles | ||||
| * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix updating of cached remote profiles | Richard van der Hoff | 2018-07-25 | 1 | -1/+8 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _update_remote_profile_cache was missing its `defer.inlineCallbacks`, so when it was called, would just return a generator object, without actually running any of the method body. | ||||
* | | | | | | | | | | | | Merge pull request #3604 from matrix-org/rav/background_process_fixes | Richard van der Hoff | 2018-07-25 | 12 | -30/+95 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | Wrap a number of things that run in the background | ||||
| * | | | | | | | | | | | Fix unit tests | Richard van der Hoff | 2018-07-25 | 2 | -8/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on_notifier_poke no longer runs synchonously, so we have to do a different hack to make sure that the replication data has been sent. Let's actually listen for its arrival. | ||||
| * | | | | | | | | | | | Changelog | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Wrap a number of things that run in the background | Richard van der Hoff | 2018-07-25 | 9 | -22/+63 |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will reduce the number of "Starting db connection from sentinel context" warnings, and will help with our metrics. | ||||
* | | | | | | | | | | | Merge pull request #3597 from matrix-org/erikj/did_forget | Erik Johnston | 2018-07-24 | 5 | -34/+38 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix client_reader worker being able to handle /context requests | ||||
| * | | | | | | | | | | | Move newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Replace usage of get_current_toke with StreamToken.START | Erik Johnston | 2018-07-24 | 2 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to handle /context/ requests on the client_reader worker without having to pull in all the various stream handlers (e.g. precence, typing, pushers etc). The only thing the token gets used for is pagination, and that ignores everything but the room portion of the token. | ||||
| * | | | | | | | | | | | Pull out did_forget to worker store | Erik Johnston | 2018-07-24 | 2 | -29/+28 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3595 from matrix-org/erikj/use_deltas | Erik Johnston | 2018-07-24 | 2 | -53/+119 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use deltas to calculate current state deltas | ||||
| * | | | | | | | | | | | Expand on docstring comment about return value | Erik Johnston | 2018-07-24 | 1 | -0/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Remove unnecessary iteritems | Erik Johnston | 2018-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixup comment (and indent) | Erik Johnston | 2018-07-24 | 1 | -16/+20 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Don't fetch state from the database unless needed | Erik Johnston | 2018-07-24 | 1 | -12/+18 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Have _get_new_state_after_events return delta | Erik Johnston | 2018-07-24 | 1 | -17/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a delta from the existing to new current state, then we can reuse that rather than manually working it out by fetching both lots of state. | ||||
| * | | | | | | | | | | | Don't require to_delete to have event_ids | Erik Johnston | 2018-07-24 | 1 | -36/+55 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3587 from matrix-org/rav/better_exception_logging | Richard van der Hoff | 2018-07-24 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improve logging for exceptions when handling PDUs | ||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Improve logging for exceptions handling PDUs | Richard van der Hoff | 2018-07-23 | 1 | -3/+8 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we get an exception handling a federation PDU, log the whole stacktrace. | ||||
* | | | | | | | | | | | Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groups | Richard van der Hoff | 2018-07-24 | 4 | -62/+98 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes and optimisations for resolve_state_groups | ||||
| * | | | | | | | | | | | Handle delta_ids being None in _update_context_for_auth_events | Richard van der Hoff | 2018-07-23 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's easier to create the new state group as a delta from the existing one. (There's an outside chance this will help with https://github.com/matrix-org/synapse/issues/3364) | ||||
| * | | | | | | | | | | | newsfile | Richard van der Hoff | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixes and optimisations for resolve_state_groups | Richard van der Hoff | 2018-07-23 | 1 | -54/+89 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, fix the logic which looks for identical input state groups so that we actually use them. This turned out to be most easily done by factoring the relevant code out to a separate function so that we could do an early return. Secondly, avoid building the whole `conflicted_state` dict (which was only ever used as a boolean flag). Thirdly, replace the construction of the `state` dict (which mapped from keys to events that set them), with an optimistic construction of the resolution result assuming there will be no conflicts. This should be no slower than building the old `state` dict, and: - in the conflicted case, we'll short-cut it, saving part of the work - in the unconflicted case, it saves rebuilding the resolution from the `state` dict. Finally, do a couple of s/values/itervalues/. | ||||
* | | | | | | | | | | | Merge pull request #3583 from matrix-org/rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-24 | 4 | -46/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | Remove redundant checks on room forgottenness | ||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-24 | 19 | -317/+437 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-23 | 30 | -196/+477 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove redundant checks on room forgottenness | Richard van der Hoff | 2018-07-23 | 4 | -46/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3550 | ||||
* | | | | | | | | | | | | Merge pull request #3592 from matrix-org/erikj/speed_up_calculate_state_delta | Erik Johnston | 2018-07-24 | 2 | -12/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | Speed up _calculate_state_delta | ||||
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-24 | 17 | -315/+415 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | erikj/speed_up_calculate_state_delta | ||||
* | | | | | | | | | | | | Merge pull request #3591 from matrix-org/rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 5 | -21/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Logcontext fixes | ||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 13 | -295/+386 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #3555 from matrix-org/erikj/client_apis_move | Erik Johnston | 2018-07-24 | 11 | -284/+364 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make client_reader support some more read only APIs | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 19 | -141/+349 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-23 | 81 | -3298/+3718 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/client_apis_move | ||||
| * | | | | | | | | | | | | | | Update docs/workers.rst | Erik Johnston | 2018-07-23 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Move PaginationHandler to its own file | Erik Johnston | 2018-07-20 | 3 | -245/+269 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Move check_in_room_or_world_readable to Auth | Erik Johnston | 2018-07-20 | 2 | -34/+40 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add some room read only APIs to client_reader | Erik Johnston | 2018-07-18 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Move RoomContextHandler out of Handlers | Erik Johnston | 2018-07-18 | 4 | -6/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for moving GET /context/ to a worker | ||||
| * | | | | | | | | | | | | | | Split MessageHandler into read only and writers | Erik Johnston | 2018-07-18 | 5 | -149/+176 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will let us call the read only parts from workers, and so be able to move some APIs off of master, e.g. the `/state` API. | ||||
* | | | | | | | | | | | | | | | Merge pull request #3590 from matrix-org/rav/persist_events_metrics | Richard van der Hoff | 2018-07-24 | 2 | -11/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | Add some measure blocks to persist_events | ||||
| * | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | fix idiocy | Richard van der Hoff | 2018-07-24 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add some measure blocks to persist_events | Richard van der Hoff | 2018-07-23 | 1 | -11/+15 |
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to help us figure out where 40% of CPU is going | ||||
| | | * | | | | | | | | | | | another couple of logcontext leaks | Richard van der Hoff | 2018-07-24 | 2 | -5/+10 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Changelog | Richard van der Hoff | 2018-07-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Logcontext fixes | Richard van der Hoff | 2018-07-24 | 3 | -16/+19 |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some random logcontext leaks. | ||||
| | | * | | | | | | | | | | Remove unnecessary if | Erik Johnston | 2018-07-24 | 1 | -2/+1 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Speed up _calculate_state_delta | Erik Johnston | 2018-07-24 | 1 | -10/+3 |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3584 from matrix-org/erikj/use_cached | Erik Johnston | 2018-07-23 | 3 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | Only get cached state from context in persist_event | ||||
| * | | | | | | | | | | | Comments | Erik Johnston | 2018-07-23 | 2 | -2/+6 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Only get cached state from context in persist_event | Erik Johnston | 2018-07-23 | 2 | -1/+16 |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to bother pulling out the current state from the DB since until we know we have to. Checking the context for state is just an optimisation. | ||||
* | | | | | | | | | | | Merge pull request #3582 from matrix-org/erikj/fixup_stateless | Erik Johnston | 2018-07-23 | 4 | -8/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing attributes on workers. | ||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix missing attributes on workers. | Erik Johnston | 2018-07-23 | 3 | -8/+14 |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missed during the transition from attribute to getter for getting state from context. | ||||
* | | | | | | | | | | | Merge pull request #3581 from matrix-org/erikj/fixup_stateless | Erik Johnston | 2018-07-23 | 2 | -7/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix EventContext when using workers | ||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix EventContext when using workers | Erik Johnston | 2018-07-23 | 1 | -7/+7 |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were: 1. Not correctly setting all attributes 2. Using defer.inlineCallbacks in a non-generator | ||||
* | | | | | | | | | | | Merge pull request #3579 from matrix-org/erikj/stateless_contexts_4 | Erik Johnston | 2018-07-23 | 14 | -99/+260 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add concept of StatelessContext, take 4. | ||||
| * | | | | | | | | | | | Update docstrings to make sense | Erik Johnston | 2018-07-23 | 1 | -5/+8 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'develop' into erikj/stateless_contexts_4 | Richard van der Hoff | 2018-07-23 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3577 from matrix-org/erikj/cleanup_context | Erik Johnston | 2018-07-23 | 3 | -63/+82 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | Refcator EventContext to accept state during init | ||||
| | * | | | | | | | | | | Fix unit tests | Erik Johnston | 2018-07-23 | 2 | -15/+40 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add support for updating state | Erik Johnston | 2018-07-23 | 2 | -9/+42 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Use new getters | Erik Johnston | 2018-07-23 | 9 | -31/+59 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Make EventContext lazy load state | Erik Johnston | 2018-07-23 | 2 | -44/+115 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | pep8 | Erik Johnston | 2018-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Refcator EventContext to accept state during init | Erik Johnston | 2018-07-23 | 2 | -63/+82 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3520 from matrix-org/matthew/sync_deleted_devices | Matthew Hodgson | 2018-07-23 | 4 | -22/+61 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Announce deleted devices explicitly over federation. | ||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/sync_deleted_devices | Matthew Hodgson | 2018-07-23 | 103 | -4671/+5379 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Make the rest of the .iterwhatever go away (#3562) | Amber Brown | 2018-07-21 | 8 | -27/+33 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3572 from matrix-org/rav/linearizer_cancellation | Richard van der Hoff | 2018-07-20 | 3 | -6/+54 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | Test and fix support for cancellation in Linearizer | ||||
| * | | | | | | | | | | Changelog | Richard van der Hoff | 2018-07-20 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Test and fix support for cancellation in Linearizer | Richard van der Hoff | 2018-07-20 | 2 | -6/+53 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3571 from matrix-org/rav/limiter_fixes | Richard van der Hoff | 2018-07-20 | 6 | -164/+88 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | A set of improvements to the Limiter | ||||
| * | | | | | | | | | | changelogs | Richard van der Hoff | 2018-07-20 | 2 | -0/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Combine Limiter and Linearizer | Richard van der Hoff | 2018-07-20 | 4 | -161/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linearizer was effectively a Limiter with max_count=1, so rather than maintaining two sets of code, let's combine them. | ||||
| * | | | | | | | | | | Improvements to the Limiter | Richard van der Hoff | 2018-07-20 | 2 | -14/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * give them names, to improve logging * use a deque rather than a list for efficiency | ||||
| * | | | | | | | | | | Add a sleep to the Limiter to fix stack overflows. | Richard van der Hoff | 2018-07-20 | 2 | -7/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3570 | ||||
* | | | | | | | | | | | Admin API for creating new users (#3415) | Amber Brown | 2018-07-20 | 8 | -3/+569 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3564 from matrix-org/hawkowl/markdown | Richard van der Hoff | 2018-07-19 | 5 | -2879/+2499 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Switch changes to markdown & flip content on for miscs | ||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into hawkowl/markdown | Amber Brown | 2018-07-19 | 1 | -7/+16 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-07-19 | 1 | -7/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Update r0.33.0 release notes github/release-v0.33.0 release-v0.33.0 | Richard van der Hoff | 2018-07-19 | 1 | -7/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (mostly just clarifications) | ||||
| | * | | | | | | | | | | fixes | Amber Brown | 2018-07-19 | 2 | -1/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | fix up weird translation things | Amber Brown | 2018-07-19 | 1 | -806/+813 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | changelog | Amber Brown | 2018-07-19 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | make pyproject point at it | Amber Brown | 2018-07-19 | 1 | -2/+27 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | rst -> md | Amber Brown | 2018-07-19 | 2 | -2867/+2454 |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-07-19 | 3 | -8/+8 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | 0.33.0 final changelog v0.33.0 | Amber Brown | 2018-07-19 | 21 | -13/+28 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | 0.33 final | Amber Brown | 2018-07-19 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | update changelogs | Amber Brown | 2018-07-19 | 6 | -2/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Revert "0.33.0rc1 changelog" | Amber Brown | 2018-07-19 | 20 | -27/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 21d3b879433e040babd43c89b62827f92e3ac861. | ||||
* | | | | | | | | | | | Don't spew errors because we can't save metrics (#3563) | Amber Brown | 2018-07-19 | 3 | -6/+25 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3507 from Peetz0r/patch-1 | Richard van der Hoff | 2018-07-19 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | Changed http links to https | ||||
| * | | | | | | | | | | change http links to https | Peter | 2018-07-10 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Especially useful for the debian repo, as this makes it easier to get the key in a secure way | ||||
* | | | | | | | | | | | revert 00bc979 | Richard van der Hoff | 2018-07-19 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... we've fixed the things that caused the warnings, so we should reinstate the warning. | ||||
* | | | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.0' into develop | Richard van der Hoff | 2018-07-19 | 23 | -14/+33 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #3561 from matrix-org/rav/disable_logcontext_warning | Richard van der Hoff | 2018-07-19 | 2 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Disable logcontext warning | ||||
| | * | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-19 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Disable logcontext warning | Richard van der Hoff | 2018-07-19 | 1 | -3/+4 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary workaround to #3518 while we release 0.33.0. | ||||
| * | | | | | | | | | | 0.33.0rc1 changelog v0.33.0rc1 | Amber Brown | 2018-07-18 | 20 | -10/+27 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | bump to 0.33.0rc1 | Amber Brown | 2018-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3556 from matrix-org/rav/background_processes | Richard van der Hoff | 2018-07-19 | 9 | -104/+67 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Run things as background processes | ||||
| * | | | | | | | | | | | Make Distributor run its processes as a background process | Richard van der Hoff | 2018-07-18 | 2 | -78/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more involved than it might otherwise be, because the current implementation just drops its logcontexts and runs everything in the sentinel context. It turns out that we aren't actually using a bunch of the functionality here (notably suppress_failures and the fact that Distributor.fire returns a deferred), so the easiest way to fix this is actually by simplifying a bunch of code. | ||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Run things as background processes | Richard van der Hoff | 2018-07-18 | 7 | -26/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #3518, and ensures that we get useful logs and metrics for lots of things that happen in the background. (There are certainly more things that happen in the background; these are just the common ones I've found running a single-process synapse locally). | ||||
* | | | | | | | | | | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460) | Amber Brown | 2018-07-19 | 13 | -101/+116 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3554 from matrix-org/erikj/response_metrics_code | Erik Johnston | 2018-07-19 | 2 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add response code to response timer metrics | ||||
| * | | | | | | | | | | | | pep8 | Erik Johnston | 2018-07-18 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add response code to response timer metrics | Erik Johnston | 2018-07-18 | 1 | -3/+5 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3559 from matrix-org/rav/pep8_config | Amber Brown | 2018-07-19 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | add config for pep8 | ||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | add config for pep8 | Richard van der Hoff | 2018-07-18 | 1 | -3/+8 |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since, for better or worse, we seem to have configured isort to generate 89-character lines, pycharm is now complaining at me that our lines are too long. So, let's configure pep8 to behave consistently with flake8. | ||||
* | | | | | | | | | | | Merge pull request #3553 from matrix-org/rav/background_process_tracking | Richard van der Hoff | 2018-07-18 | 3 | -5/+187 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Resource tracking for background processes | ||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Resource tracking for background processes | Richard van der Hoff | 2018-07-18 | 2 | -5/+186 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a mechanism for tracking resource usage by background processes, along with an example of how it will be used. This will help address #3518, but more importantly will give us better insights into things which are happening but not being shown up by the request metrics. We *could* do this with Measure blocks, but: - I think having them pulled out as a completely separate metric class will make it easier to distinguish top-level processes from those which are nested. - I want to be able to report on in-flight background processes, and I don't think we want to do this for *all* Measure blocks. | ||||
* | | | | | | | | | | Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-18 | 2 | -43/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Remove event re-signing hacks | ||||
| * | | | | | | | | | | Add changelog | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' into rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-04 | 152 | -642/+2188 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove event re-signing hacks | Richard van der Hoff | 2018-06-07 | 1 | -43/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These "temporary fixes" have been here three and a half years, and I can't find any events in the matrix.org database where the calculated signature differs from what's in the db. It's time for them to go away. | ||||
* | | | | | | | | | | | | Merge pull request #3514 from matrix-org/dbkr/turn_dont_add_defaults | David Baker | 2018-07-18 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | Comment dummy TURN parameters in default config | ||||
| * | | | | | | | | | | | I failed to correctly guess the PR number | David Baker | 2018-07-11 | 1 | -0/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Comment dummy TURN parameters in default config | David Baker | 2018-07-11 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This default config is parsed and used a base before the actual config is overlaid, so with these values not commented out, the code to detect when no turn params were set and refuse to generate credentials was never firing because the dummy default was always set. | ||||
* | | | | | | | | | | | | Merge pull request #3546 from matrix-org/rav/fix_erasure_over_federation | Richard van der Hoff | 2018-07-17 | 3 | -56/+133 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility of events from erased users over federation | ||||
| * | | | | | | | | | | | | add a comment | Richard van der Hoff | 2018-07-17 | 1 | -0/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix visibility of events from erased users over federation | Richard van der Hoff | 2018-07-17 | 2 | -56/+130 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_server | Richard van der Hoff | 2018-07-17 | 4 | -138/+409 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and optimze filter_events_for_server | ||||
| * | | | | | | | | | | | | fix imports | Richard van der Hoff | 2018-07-17 | 2 | -0/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | add a comment | Richard van der Hoff | 2018-07-17 | 1 | -0/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Changelog | Richard van der Hoff | 2018-07-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Attempt to make _filter_events_for_server more efficient | Richard van der Hoff | 2018-07-16 | 1 | -17/+23 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add a test which profiles filter_events_for_server in a large room | Richard van der Hoff | 2018-07-16 | 1 | -2/+155 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Move filter_events_for_server out of FederationHandler | Richard van der Hoff | 2018-07-16 | 3 | -138/+245 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for easier unit testing. | ||||
* | | | | | | | | | | | | | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 13 | -934/+939 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #3544 from matrix-org/erikj/fixup_stream_cache | Erik Johnston | 2018-07-17 | 3 | -1/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix perf regression in PR #3530 | ||||
| * | | | | | | | | | | | | | Use efficient .intersection | Erik Johnston | 2018-07-17 | 1 | -4/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Add unit test | Erik Johnston | 2018-07-17 | 1 | -0/+16 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-17 | 1 | -0/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix perf regression in PR #3530 | Erik Johnston | 2018-07-17 | 1 | -1/+6 |
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The get_entities_changed function was changed to return all changed entities since the given stream position, rather than only those changed from a given list of entities. This resulted in the function incorrectly returning large numbers of entities that, for example, caused large increases in database usage. | ||||
* | | | | | | | | | | | | | Merge pull request #3530 from matrix-org/erikj/stream_cache | Amber Brown | 2018-07-17 | 3 | -11/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't return unknown entities in get_entities_changed | ||||
| * | | | | | | | | | | | | | Fixup unit test | Erik Johnston | 2018-07-13 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-13 | 1 | -0/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Don't return unknown entities in get_entities_changed | Erik Johnston | 2018-07-13 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stream cache keeps track of all entities that have changed since a particular stream position, so get_entities_changed does not need to return unknown entites when given a larger stream position. This makes it consistent with the behaviour of has_entity_changed. | ||||
* | | | | | | | | | | | | | | Merge pull request #3540 from krombel/enforce_isort | Amber Brown | 2018-07-17 | 8 | -9/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check isort by travis | ||||
| * | | | | | | | | | | | | | | rename 'isort' to 'check_isort' as requested | Krombel | 2018-07-16 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | rerun isort with latest version | Krombel | 2018-07-16 | 6 | -20/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | check isort by travis | Krombel | 2018-07-16 | 14 | -13/+37 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Fix develop because I broke it :( (#3535) | Amber Brown | 2018-07-14 | 3 | -2/+5 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet | Amber Brown | 2018-07-14 | 18 | -165/+102 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use parse and asserts from http.servlet | ||||
| * | | | | | | | | | | | | | | fix sytests | Amber Brown | 2018-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | add changelog | Krombel | 2018-07-13 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | rename assert_params_in_request to assert_params_in_dict | Krombel | 2018-07-13 | 11 | -33/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the method "assert_params_in_request" does handle dicts and not requests. A request body has to be parsed to json before this method can be used | ||||
| * | | | | | | | | | | | | | | Use parse_{int,str} and assert from http.servlet | Krombel | 2018-07-13 | 14 | -155/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parse_integer and parse_string can take a request and raise errors in case we have wrong or missing params. This PR tries to use them more to deduplicate some code and make it better readable | ||||
* | | | | | | | | | | | | | | | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 10 | -98/+97 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge pull request #3533 from matrix-org/rav/fix_federation_ratelimite_queue | Richard van der Hoff | 2018-07-13 | 3 | -10/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Make FederationRateLimiter queue requests properly | ||||
| * | | | | | | | | | | | | | better changelog | Richard van der Hoff | 2018-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix unit tests | Richard van der Hoff | 2018-07-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Make FederationRateLimiter queue requests properly | Richard van der Hoff | 2018-07-13 | 1 | -10/+23 |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | popitem removes the *most recent* item by default [1]. We want the oldest. Fixes #3524 [1]: https://docs.python.org/2/library/collections.html#collections.OrderedDict.popitem | ||||
* / / / / / / / / / / / / | typo | Matthew Hodgson | 2018-07-13 | 1 | -3/+3 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3521 from matrix-org/rav/optimise_stream_change_cache | Richard van der Hoff | 2018-07-12 | 2 | -8/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce set building in get_entities_changed | ||||
| * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-12 | 1 | -0/+1 |
| | | | | | | | | | | | | |