summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3469 from DJViking/masterRichard van der Hoff2018-07-271-0/+13
|\ | | | | Add instructions for install on OpenSUSE and SLES
| * Add instructions for install on OpenSUSE and SLESSverre Moe2018-07-011-0/+13
| |
* | Merge pull request #3616 from matrix-org/travis/event_id_send_leaveRichard van der Hoff2018-07-262-2/+3
|\ \ | | | | | | Update the send_leave path to be an event_id
| * | Create 3616.miscTravis Ralston2018-07-261-0/+1
| | |
| * | Update the send_leave path to be an event_idTravis Ralston2018-07-261-2/+2
| | | | | | | | | It's still not used, however the parameter is an event ID not a transaction ID.
* | | Merge pull request #3614 from matrix-org/rav/stop_populating_event_contentRichard van der Hoff2018-07-264-2/+99
|\ \ \ | | | | | | | | Stop populating events.content
| * | | changelogRichard van der Hoff2018-07-261-0/+1
| | | |
| * | | Create the column nullableRichard van der Hoff2018-07-262-9/+13
| | | | | | | | | | | | | | | | | | | | There's no real point in ever making the column non-nullable, and doing so breaks the sytests.
| * | | Stop populating events.contentRichard van der Hoff2018-07-262-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.
* | | | Deduplicate redundant lazy-loaded members (#3331)Matthew Hodgson2018-07-263-25/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * attempt at deduplicating lazy-loaded members as per the proposal; we can deduplicate redundant lazy-loaded members which are sent in the same sync sequence. we do this heuristically rather than requiring the client to somehow tell us which members it has chosen to cache, by instead caching the last N members sent to a client, and not sending them again. For now we hardcode N to 100. Each cache for a given (user,device) tuple is in turn cached for up to X minutes (to avoid the caches building up). For now we hardcode X to 30. * add include_redundant_members filter option & make it work * remove stale todo * add tests for _get_some_state_from_cache * incorporate review
* | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_idRichard van der Hoff2018-07-263-8/+7
|\ \ \ \ | |_|/ / |/| | | Remove some redundant joins on event_edges.room_id
| * | | changelogRichard van der Hoff2018-07-261-0/+1
| | | |
| * | | Remove some redundant joins on event_edges.room_idRichard van der Hoff2018-07-262-8/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | We've long passed the point where it's possible to have the same event_id in different tables, so these join conditions are redundant: we can just join on event_id. event_edges is of non-trivial size, and the room_id column is wasteful, so let's stop reading from it. In future, we can stop writing to it, and then drop it.
* | | Merge pull request #3610 from matrix-org/rav/fix_looping_callsRichard van der Hoff2018-07-2613-15/+24
|\ \ \ | |/ / |/| | Fix some looping_call calls which were broken in #3604
| * | Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-2613-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that looping_call does check the deferred returned by its callback, and (at least in the case of client_ips), we were relying on this, and I broke it in #3604. Update run_as_background_process to return the deferred, and make sure we return it to clock.looping_call.
* | | comment on event_edgesRichard van der Hoff2018-07-261-1/+2
|/ /
* | Merge pull request #2970 from matrix-org/matthew/filter_membersMatthew Hodgson2018-07-265-62/+532
|\ \ | | | | | | Implement the lazy_load_members room state filter parameter
| * | switch missing_types to be a boolMatthew Hodgson2018-07-251-4/+4
| | |
| * | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2534-238/+389
| |\ \
| * | | flake8Matthew Hodgson2018-07-251-12/+12
| | | |
| * | | add tests for _get_some_state_from_cacheMatthew Hodgson2018-07-251-0/+150
| | | |
| * | | incorporate more review.Matthew Hodgson2018-07-251-16/+14
| | | |
| * | | handle the edge case for _get_some_state_from_cache where types is []Matthew Hodgson2018-07-241-1/+7
| | | |
| * | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-242-12/+5
| |\ \ \
| * | | | clarify comment on p_idsMatthew Hodgson2018-07-241-1/+2
| | | | |
| * | | | consider non-filter_type types as wildcards, thus missing from the ↵Matthew Hodgson2018-07-241-1/+4
| | | | | | | | | | | | | | | | | | | | state-group-cache
| * | | | rather than adding ll_ids, remove them from p_idsMatthew Hodgson2018-07-241-5/+6
| | | | |
| * | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2417-316/+416
| |\ \ \ \
| * | | | | incorporate more reviewMatthew Hodgson2018-07-243-30/+27
| | | | | |
| * | | | | handle case where types is [] on postgres correctlyMatthew Hodgson2018-07-231-1/+1
| | | | | |
| * | | | | changelogMatthew Hodgson2018-07-231-0/+1
| | | | | |
| * | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2353-3241/+3681
| |\ \ \ \ \
| * | | | | | incorporate reviewMatthew Hodgson2018-07-232-52/+35
| | | | | | |
| * | | | | | make test workMatthew Hodgson2018-07-191-37/+46
| | | | | | |
| * | | | | | first cut of a UT for testing state store (untested)Matthew Hodgson2018-07-191-0/+151
| | | | | | |
| * | | | | | fix thinkos; unbreak testsMatthew Hodgson2018-07-191-2/+2
| | | | | | |
| * | | | | | incorporate reviewMatthew Hodgson2018-07-192-20/+31
| | | | | | |
| * | | | | | add a filtered_types param to limit filtering to specific typesMatthew Hodgson2018-07-192-82/+96
| | | | | | |
| * | | | | | merge develop pydoc for _get_state_for_groupsMatthew Hodgson2018-07-19370-3768/+6264
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-1028-178/+531
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-0459-181/+496
| |\ \ \ \ \ \ \ \
| * | | | | | | | | more commentsMatthew Hodgson2018-06-041-0/+7
| | | | | | | | | |
| * | | | | | | | | add lazy_load_members to the filter json schemaMatthew Hodgson2018-05-291-1/+4
| | | | | | | | | |
| * | | | | | | | | pep8Matthew Hodgson2018-05-291-0/+1
| | | | | | | | | |
| * | | | | | | | | disable CPUMetrics if no /proc/self/statMatthew Hodgson2018-05-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes build on macOS again
| * | | | | | | | | fix dumb typoMatthew Hodgson2018-05-291-4/+4
| | | | | | | | | |
| * | | | | | | | | add pydocMatthew Hodgson2018-05-292-27/+67
| | | | | | | | | |
| * | | | | | | | | merge developMatthew Hodgson2018-05-29242-3342/+7386
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | make lazy_load_members configurable in filtersMatthew Hodgson2018-03-192-9/+15
| | | | | | | | | | |
| * | | | | | | | | | reshuffle todo & commentsMatthew Hodgson2018-03-191-2/+10
| | | | | | | | | | |
| * | | | | | | | | | only get member state IDs for incremental syncs if we're filteringMatthew Hodgson2018-03-181-5/+5
| | | | | | | | | | |
| * | | | | | | | | | remove stale importMatthew Hodgson2018-03-161-1/+0
| | | | | | | | | | |
| * | | | | | | | | | remove debugMatthew Hodgson2018-03-161-4/+0
| | | | | | | | | | |
| * | | | | | | | | | fix tsm search againMatthew Hodgson2018-03-161-5/+4
| | | | | | | | | | |
| * | | | | | | | | | add state_ids for timeline entriesMatthew Hodgson2018-03-161-4/+14
| | | | | | | | | | |
| * | | | | | | | | | simplify timeline_start_membersMatthew Hodgson2018-03-161-14/+13
| | | | | | | | | | |
| * | | | | | | | | | Replace some ujson with simplejson to make it workErik Johnston2018-03-164-4/+5
| | | | | | | | | | |
| * | | | | | | | | | make incr syncs workMatthew Hodgson2018-03-161-3/+4
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-03-1410-144/+711
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pep8Matthew Hodgson2018-03-141-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | add copyright to nudge CIMatthew Hodgson2018-03-141-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | oopsMatthew Hodgson2018-03-131-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | make it workMatthew Hodgson2018-03-132-7/+9
| | | | | | | | | | | |
| * | | | | | | | | | | remove comment now #2969 is fixedMatthew Hodgson2018-03-131-6/+0
| | | | | | | | | | | |
| * | | | | | | | | | | merge proper fix to bug 2969Matthew Hodgson2018-03-1346-336/+576
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | typoeMatthew Hodgson2018-03-131-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | disable optimisation for searching for state groupsMatthew Hodgson2018-03-131-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when type filter includes wildcards on state_key
| | * | | | | | | | | | | build where_clause sanelyMatthew Hodgson2018-03-131-6/+4
| | | | | | | | | | | | |
| | * | | | | | | | | | | PR feedbackzMatthew Hodgson2018-03-131-3/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | fix bug #2926Matthew Hodgson2018-03-131-4/+17
| | | | | | | | | | | | |
| * | | | | | | | | | | | ensure we always include the members for a given timeline blockMatthew Hodgson2018-03-131-4/+32
| | | | | | | | | | | | |
| * | | | | | | | | | | | correctly handle None state_keysMatthew Hodgson2018-03-121-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and fix include_other_types thinko
| * | | | | | | | | | | | fix sqlite where clauseMatthew Hodgson2018-03-121-2/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | typosMatthew Hodgson2018-03-112-2/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | WIP experiment in lazyloading room membersMatthew Hodgson2018-03-112-17/+73
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3609 from matrix-org/travis/doc-typo-2Travis Ralston2018-07-252-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | Fix a minor documentation typo in on_make_leave
| * | | | | | | | | | | | Create 3609.miscTravis Ralston2018-07-251-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix a minor documentation typo in on_make_leaveTravis Ralston2018-07-251-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3603 from matrix-org/erikj/handle_outliersErik Johnston2018-07-252-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly handle outliers during persist events
| * | | | | | | | | | | | Actually fix it by adding continueErik Johnston2018-07-251-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix typo in conditionalErik Johnston2018-07-251-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | NewsfileErik Johnston2018-07-251-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Correctly handle outliers during persist eventsErik Johnston2018-07-251-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_moreRichard van der Hoff2018-07-253-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix another logcontext leak in _persist_events
| * | | | | | | | | | | | | Fix another logcontext leak in _persist_eventsRichard van der Hoff2018-07-253-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_errorRichard van der Hoff2018-07-252-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix occasional 'tuple index out of range' error
| * | | | | | | | | | | | | Fix occasional 'tuple index out of range' errorRichard van der Hoff2018-07-252-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_cacheRichard van der Hoff2018-07-252-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix updating of cached remote profiles
| * | | | | | | | | | | | | changelogRichard van der Hoff2018-07-251-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix updating of cached remote profilesRichard van der Hoff2018-07-251-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_fixesRichard van der Hoff2018-07-2512-30/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Wrap a number of things that run in the background
| * | | | | | | | | | | | Fix unit testsRichard van der Hoff2018-07-252-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.
| * | | | | | | | | | | | ChangelogRichard van der Hoff2018-07-251-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Wrap a number of things that run in the backgroundRichard van der Hoff2018-07-259-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_forgetErik Johnston2018-07-245-34/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix client_reader worker being able to handle /context requests
| * | | | | | | | | | | | Move newsfileErik Johnston2018-07-241-0/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | NewsfileErik Johnston2018-07-241-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Replace usage of get_current_toke with StreamToken.STARTErik Johnston2018-07-242-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 storeErik Johnston2018-07-242-29/+28
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3595 from matrix-org/erikj/use_deltasErik Johnston2018-07-242-53/+119
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Use deltas to calculate current state deltas
| * | | | | | | | | | | | Expand on docstring comment about return valueErik Johnston2018-07-241-0/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove unnecessary iteritemsErik Johnston2018-07-241-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixup comment (and indent)Erik Johnston2018-07-241-16/+20
| | | | | | | | | | | | |
| * | | | | | | | | | | | NewsfileErik Johnston2018-07-241-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Don't fetch state from the database unless neededErik Johnston2018-07-241-12/+18
| | | | | | | | | | | | |
| * | | | | | | | | | | | Have _get_new_state_after_events return deltaErik Johnston2018-07-241-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_idsErik Johnston2018-07-241-36/+55
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3587 from matrix-org/rav/better_exception_loggingRichard van der Hoff2018-07-242-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Improve logging for exceptions when handling PDUs
| * | | | | | | | | | | | changelogRichard van der Hoff2018-07-231-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Improve logging for exceptions handling PDUsRichard van der Hoff2018-07-231-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_groupsRichard van der Hoff2018-07-244-62/+98
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes and optimisations for resolve_state_groups
| * | | | | | | | | | | | Handle delta_ids being None in _update_context_for_auth_eventsRichard van der Hoff2018-07-232-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)
| * | | | | | | | | | | | newsfileRichard van der Hoff2018-07-231-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixes and optimisations for resolve_state_groupsRichard van der Hoff2018-07-231-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_roomRichard van der Hoff2018-07-244-46/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Remove redundant checks on room forgottenness
| * | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-2419-317/+437
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-2330-196/+477
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove redundant checks on room forgottennessRichard van der Hoff2018-07-234-46/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3550
* | | | | | | | | | | | | Merge pull request #3592 from matrix-org/erikj/speed_up_calculate_state_deltaErik Johnston2018-07-242-12/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | Speed up _calculate_state_delta
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-07-2417-315/+415
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | erikj/speed_up_calculate_state_delta
* | | | | | | | | | | | | Merge pull request #3591 from matrix-org/rav/logcontext_fixesRichard van der Hoff2018-07-245-21/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logcontext fixes
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into rav/logcontext_fixesRichard van der Hoff2018-07-2413-295/+386
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3555 from matrix-org/erikj/client_apis_moveErik Johnston2018-07-2411-284/+364
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make client_reader support some more read only APIs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into erikj/client_apis_moveErik Johnston2018-07-2419-141/+349
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-07-2381-3298/+3718
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/client_apis_move
| * | | | | | | | | | | | | | | Update docs/workers.rstErik Johnston2018-07-231-0/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Move PaginationHandler to its own fileErik Johnston2018-07-203-245/+269
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Move check_in_room_or_world_readable to AuthErik Johnston2018-07-202-34/+40
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | NewsfileErik Johnston2018-07-181-0/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add some room read only APIs to client_readerErik Johnston2018-07-181-1/+13
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Move RoomContextHandler out of HandlersErik Johnston2018-07-184-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for moving GET /context/ to a worker
| * | | | | | | | | | | | | | | Split MessageHandler into read only and writersErik Johnston2018-07-185-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_metricsRichard van der Hoff2018-07-242-11/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Add some measure blocks to persist_events
| * | | | | | | | | | | | | | | changelogRichard van der Hoff2018-07-241-0/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix idiocyRichard van der Hoff2018-07-241-2/+8
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add some measure blocks to persist_eventsRichard van der Hoff2018-07-231-11/+15
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to help us figure out where 40% of CPU is going
| | | * | | | | | | | | | | | another couple of logcontext leaksRichard van der Hoff2018-07-242-5/+10
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | ChangelogRichard van der Hoff2018-07-241-0/+1
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Logcontext fixesRichard van der Hoff2018-07-243-16/+19
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some random logcontext leaks.
| | | * | | | | | | | | | | Remove unnecessary ifErik Johnston2018-07-241-2/+1
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | NewsfileErik Johnston2018-07-241-0/+1
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Speed up _calculate_state_deltaErik Johnston2018-07-241-10/+3
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3584 from matrix-org/erikj/use_cachedErik Johnston2018-07-233-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | Only get cached state from context in persist_event
| * | | | | | | | | | | | CommentsErik Johnston2018-07-232-2/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | NewsfileErik Johnston2018-07-231-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Only get cached state from context in persist_eventErik Johnston2018-07-232-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_statelessErik Johnston2018-07-234-8/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing attributes on workers.
| * | | | | | | | | | | | NewsfileErik Johnston2018-07-231-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix missing attributes on workers.Erik Johnston2018-07-233-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_statelessErik Johnston2018-07-232-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix EventContext when using workers
| * | | | | | | | | | | | NewsfileErik Johnston2018-07-231-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix EventContext when using workersErik Johnston2018-07-231-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_4Erik Johnston2018-07-2314-99/+260
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add concept of StatelessContext, take 4.
| * | | | | | | | | | | | Update docstrings to make senseErik Johnston2018-07-231-5/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' into erikj/stateless_contexts_4Richard van der Hoff2018-07-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3577 from matrix-org/erikj/cleanup_contextErik Johnston2018-07-233-63/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | Refcator EventContext to accept state during init
| | * | | | | | | | | | | Fix unit testsErik Johnston2018-07-232-15/+40
| | | | | | | | | | | | |
| | * | | | | | | | | | | NewsfileErik Johnston2018-07-231-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add support for updating stateErik Johnston2018-07-232-9/+42
| | | | | | | | | | | | |
| | * | | | | | | | | | | Use new gettersErik Johnston2018-07-239-31/+59
| | | | | | | | | | | | |
| | * | | | | | | | | | | Make EventContext lazy load stateErik Johnston2018-07-232-44/+115
| |/ / / / / / / / / / /
| * | | | | | | | | | | pep8Erik Johnston2018-07-231-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | NewsfileErik Johnston2018-07-231-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Refcator EventContext to accept state during initErik Johnston2018-07-232-63/+82
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3520 from matrix-org/matthew/sync_deleted_devicesMatthew Hodgson2018-07-234-22/+61
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Announce deleted devices explicitly over federation.
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into matthew/sync_deleted_devicesMatthew Hodgson2018-07-23103-4671/+5379
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Make the rest of the .iterwhatever go away (#3562)Amber Brown2018-07-218-27/+33
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3572 from matrix-org/rav/linearizer_cancellationRichard van der Hoff2018-07-203-6/+54
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | Test and fix support for cancellation in Linearizer
| * | | | | | | | | | | ChangelogRichard van der Hoff2018-07-201-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Test and fix support for cancellation in LinearizerRichard van der Hoff2018-07-202-6/+53
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3571 from matrix-org/rav/limiter_fixesRichard van der Hoff2018-07-206-164/+88
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | A set of improvements to the Limiter
| * | | | | | | | | | | changelogsRichard van der Hoff2018-07-202-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Combine Limiter and LinearizerRichard van der Hoff2018-07-204-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 LimiterRichard van der Hoff2018-07-202-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 Hoff2018-07-202-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3570
* | | | | | | | | | | | Admin API for creating new users (#3415)Amber Brown2018-07-208-3/+569
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3564 from matrix-org/hawkowl/markdownRichard van der Hoff2018-07-195-2879/+2499
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Switch changes to markdown & flip content on for miscs
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into hawkowl/markdownAmber Brown2018-07-191-7/+16
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into developRichard van der Hoff2018-07-191-7/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update r0.33.0 release notes github/release-v0.33.0 release-v0.33.0Richard van der Hoff2018-07-191-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (mostly just clarifications)
| | * | | | | | | | | | | fixesAmber Brown2018-07-192-1/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | fix up weird translation thingsAmber Brown2018-07-191-806/+813
| | | | | | | | | | | | |
| | * | | | | | | | | | | changelogAmber Brown2018-07-191-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | make pyproject point at itAmber Brown2018-07-191-2/+27
| | | | | | | | | | | | |
| | * | | | | | | | | | | rst -> mdAmber Brown2018-07-192-2867/+2454
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into developAmber Brown2018-07-193-8/+8
|\| | | | | | | | | | |
| * | | | | | | | | | | 0.33.0 final changelog v0.33.0Amber Brown2018-07-1921-13/+28
| | | | | | | | | | | |
| * | | | | | | | | | | 0.33 finalAmber Brown2018-07-191-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | update changelogsAmber Brown2018-07-196-2/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Revert "0.33.0rc1 changelog"Amber Brown2018-07-1920-27/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 21d3b879433e040babd43c89b62827f92e3ac861.
* | | | | | | | | | | | Don't spew errors because we can't save metrics (#3563)Amber Brown2018-07-193-6/+25
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3507 from Peetz0r/patch-1Richard van der Hoff2018-07-191-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | Changed http links to https
| * | | | | | | | | | | change http links to httpsPeter2018-07-101-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Especially useful for the debian repo, as this makes it easier to get the key in a secure way
* | | | | | | | | | | | revert 00bc979Richard van der Hoff2018-07-191-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 developRichard van der Hoff2018-07-1923-14/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3561 from matrix-org/rav/disable_logcontext_warningRichard van der Hoff2018-07-192-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Disable logcontext warning
| | * | | | | | | | | | | changelogRichard van der Hoff2018-07-191-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Disable logcontext warningRichard van der Hoff2018-07-191-3/+4
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary workaround to #3518 while we release 0.33.0.
| * | | | | | | | | | | 0.33.0rc1 changelog v0.33.0rc1Amber Brown2018-07-1820-10/+27
| | | | | | | | | | | |
| * | | | | | | | | | | bump to 0.33.0rc1Amber Brown2018-07-181-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3556 from matrix-org/rav/background_processesRichard van der Hoff2018-07-199-104/+67
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Run things as background processes
| * | | | | | | | | | | | Make Distributor run its processes as a background processRichard van der Hoff2018-07-182-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.
| * | | | | | | | | | | | changelogRichard van der Hoff2018-07-181-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Run things as background processesRichard van der Hoff2018-07-187-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 Brown2018-07-1913-101/+116
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3554 from matrix-org/erikj/response_metrics_codeErik Johnston2018-07-192-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add response code to response timer metrics
| * | | | | | | | | | | | | pep8Erik Johnston2018-07-181-1/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | NewsfileErik Johnston2018-07-181-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add response code to response timer metricsErik Johnston2018-07-181-3/+5
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3559 from matrix-org/rav/pep8_configAmber Brown2018-07-192-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | add config for pep8
| * | | | | | | | | | | | changelogRichard van der Hoff2018-07-181-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | add config for pep8Richard van der Hoff2018-07-181-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_trackingRichard van der Hoff2018-07-183-5/+187
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Resource tracking for background processes
| * | | | | | | | | | | changelogRichard van der Hoff2018-07-181-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Resource tracking for background processesRichard van der Hoff2018-07-182-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_hacksRichard van der Hoff2018-07-182-43/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove event re-signing hacks
| * | | | | | | | | | | Add changelogRichard van der Hoff2018-07-041-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' into rav/drop_re_signing_hacksRichard van der Hoff2018-07-04152-642/+2188
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove event re-signing hacksRichard van der Hoff2018-06-071-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_defaultsDavid Baker2018-07-182-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | Comment dummy TURN parameters in default config
| * | | | | | | | | | | | I failed to correctly guess the PR numberDavid Baker2018-07-111-0/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Comment dummy TURN parameters in default configDavid Baker2018-07-112-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_federationRichard van der Hoff2018-07-173-56/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility of events from erased users over federation
| * | | | | | | | | | | | | add a commentRichard van der Hoff2018-07-171-0/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | changelogRichard van der Hoff2018-07-171-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix visibility of events from erased users over federationRichard van der Hoff2018-07-172-56/+130
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_serverRichard van der Hoff2018-07-174-138/+409
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and optimze filter_events_for_server
| * | | | | | | | | | | | | fix importsRichard van der Hoff2018-07-172-0/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | add a commentRichard van der Hoff2018-07-171-0/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | ChangelogRichard van der Hoff2018-07-161-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Attempt to make _filter_events_for_server more efficientRichard van der Hoff2018-07-161-17/+23
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add a test which profiles filter_events_for_server in a large roomRichard van der Hoff2018-07-161-2/+155
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Move filter_events_for_server out of FederationHandlerRichard van der Hoff2018-07-163-138/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for easier unit testing.
* | | | | | | | | | | | | | Refactor REST API tests to use explicit reactors (#3351)Amber Brown2018-07-1713-934/+939
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3544 from matrix-org/erikj/fixup_stream_cacheErik Johnston2018-07-173-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix perf regression in PR #3530
| * | | | | | | | | | | | | | Use efficient .intersectionErik Johnston2018-07-171-4/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add unit testErik Johnston2018-07-171-0/+16
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | NewsfileErik Johnston2018-07-171-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix perf regression in PR #3530Erik Johnston2018-07-171-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_cacheAmber Brown2018-07-173-11/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't return unknown entities in get_entities_changed
| * | | | | | | | | | | | | | Fixup unit testErik Johnston2018-07-131-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | NewsfileErik Johnston2018-07-131-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Don't return unknown entities in get_entities_changedErik Johnston2018-07-131-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_isortAmber Brown2018-07-178-9/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check isort by travis
| * | | | | | | | | | | | | | | rename 'isort' to 'check_isort' as requestedKrombel2018-07-162-3/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | rerun isort with latest versionKrombel2018-07-166-20/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | check isort by travisKrombel2018-07-1614-13/+37
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Fix develop because I broke it :( (#3535)Amber Brown2018-07-143-2/+5
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servletAmber Brown2018-07-1418-165/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use parse and asserts from http.servlet
| * | | | | | | | | | | | | | | fix sytestsAmber Brown2018-07-141-1/+1
| | | | | | | | | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-15 00:07:11 +0000