Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | linting | Matthew Hodgson | 2018-08-12 | 1 | -25/+23 |
| | |||||
* | fix idiocies and so make tests pass | Matthew Hodgson | 2018-08-12 | 3 | -11/+15 |
| | |||||
* | first cut at a UT | Matthew Hodgson | 2018-08-12 | 1 | -0/+141 |
| | |||||
* | don't needlessly return user_id | Matthew Hodgson | 2018-08-12 | 1 | -1/+0 |
| | |||||
* | improve docstring | Matthew Hodgson | 2018-08-12 | 1 | -1/+5 |
| | |||||
* | switch get_current_version_info back to being get_version_info | Matthew Hodgson | 2018-08-12 | 1 | -4/+7 |
| | |||||
* | fix flakes | Matthew Hodgson | 2018-08-12 | 2 | -4/+6 |
| | |||||
* | fix typos | Matthew Hodgson | 2018-08-12 | 2 | -2/+3 |
| | |||||
* | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 2 | -9/+113 |
| | |||||
* | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 1 | -20/+31 |
| | |||||
* | more docstring for the e2e_room_keys rest | Matthew Hodgson | 2018-08-12 | 2 | -2/+51 |
| | |||||
* | add storage docstring; remove unused set_e2e_room_keys | Matthew Hodgson | 2018-08-12 | 1 | -36/+83 |
| | |||||
* | fix factoring out of _should_replace_room_key | Matthew Hodgson | 2018-08-12 | 1 | -3/+4 |
| | |||||
* | rename room_key_version table correctly, and fix opt args | Matthew Hodgson | 2018-08-12 | 2 | -16/+16 |
| | |||||
* | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 5 | -79/+99 |
| | |||||
* | make /room_keys/version work | Matthew Hodgson | 2018-08-12 | 4 | -15/+38 |
| | |||||
* | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 5 | -6/+171 |
| | |||||
* | document the API | Matthew Hodgson | 2018-08-12 | 1 | -0/+133 |
| | |||||
* | make it work and fix pep8 | Matthew Hodgson | 2018-08-12 | 7 | -82/+134 |
| | |||||
* | interim WIP checkin; doesn't build yet | Matthew Hodgson | 2018-08-12 | 3 | -19/+84 |
| | |||||
* | total WIP skeleton for /room_keys API | Matthew Hodgson | 2018-08-12 | 4 | -0/+289 |
| | |||||
* | 0.33.2 changelog v0.33.2 github/release-v0.33.2 release-v0.33.2 | Amber Brown | 2018-08-09 | 1 | -0/+6 |
| | |||||
* | 0.33.2 | Amber Brown | 2018-08-09 | 1 | -1/+1 |
| | |||||
* | fix the changelog & template | Amber Brown | 2018-08-09 | 2 | -50/+50 |
| | |||||
* | fix changelog | Amber Brown | 2018-08-07 | 1 | -1/+4 |
| | |||||
* | fix for rc1 v0.33.2rc1 | Amber Brown | 2018-08-07 | 2 | -3/+3 |
| | |||||
* | changelog | Amber Brown | 2018-08-07 | 59 | -54/+64 |
| | |||||
* | version | Amber Brown | 2018-08-07 | 1 | -1/+1 |
| | |||||
* | Return M_NOT_FOUND when a profile could not be found. (#3596) | Will Hunt | 2018-08-03 | 2 | -31/+59 |
| | |||||
* | Merge pull request #3644 from ↵ | Michael Kaye | 2018-08-03 | 9 | -112/+139 |
|\ | | | | | | | | | matrix-org/michaelkaye/refactor_docker_locations_v2 Refactor Dockerfile location | ||||
| * | Update README.md | Michael Kaye | 2018-08-03 | 1 | -1/+1 |
| | | | | | | Link to contrib/docker | ||||
| * | Update README.md | Michael Kaye | 2018-08-03 | 1 | -1/+1 |
| | | | | | | Link to docker/README.md | ||||
| * | Update README.rst | Michael Kaye | 2018-08-03 | 1 | -1/+1 |
| | | | | | | Link to contrib/docker | ||||
| * | Update README.rst | Michael Kaye | 2018-08-03 | 1 | -3/+10 |
| | | | | | | wrap at 80ish | ||||
| * | Add news entry | Michael Kaye | 2018-08-02 | 1 | -0/+1 |
| | | |||||
| * | Address SPAG issues | Michael Kaye | 2018-08-02 | 1 | -2/+4 |
| | | |||||
| * | Do not include docker files in python build | Michael Kaye | 2018-08-02 | 1 | -0/+1 |
| | | |||||
| * | Refactor docker locations and README. | Michael Kaye | 2018-08-02 | 7 | -110/+126 |
| | | | | | | | | This addresses #3224 | ||||
* | | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment | Amber Brown | 2018-08-03 | 2 | -1/+2 |
|\ \ | |/ |/| | Mention the word "newsfragment" in CONTRIBUTING.rst | ||||
| * | newsfragment | Michael Kaye | 2018-08-02 | 1 | -0/+1 |
| | | |||||
| * | Mention the word "newsfragment" in CONTRIBUTING.rst | Michael Kaye | 2018-08-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 9 | -142/+124 |
|\ | | | | | Clean up handling of errors from outbound requests | ||||
| * | changelog | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
| | | |||||
| * | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 5 | -78/+47 |
| | | | | | | | | | | | | | | | | | | | | | | This code brings the SimpleHttpClient into line with the MatrixFederationHttpClient by having it raise HttpResponseExceptions when a request fails (rather than trying to parse for matrix errors and maybe raising MatrixCodeMessageException). Then, whenever we were checking for MatrixCodeMessageException and turning them into SynapseErrors, we now need to check for HttpResponseExceptions and call to_synapse_error. | ||||
| * | Refactor code for turning HttpResponseException into SynapseError | Richard van der Hoff | 2018-08-01 | 3 | -34/+56 |
| | | | | | | | | | | | | | | | | This commit replaces SynapseError.from_http_response_exception with HttpResponseException.to_synapse_error. The new method actually returns a ProxiedRequestError, which allows us to pass through additional metadata from the API call. | ||||
| * | Be more careful which errors we send back over the C-S API | Richard van der Hoff | 2018-08-01 | 3 | -32/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | We really shouldn't be sending all CodeMessageExceptions back over the C-S API; it will include things like 401s which we shouldn't proxy. That means that we need to explicitly turn a few HttpResponseExceptions into SynapseErrors in the federation layer. The effect of the latter is that the matrix errcode will get passed through correctly to calling clients, which might help with some of the random M_UNKNOWN errors when trying to join rooms. | ||||
* | | Merge pull request #3638 from ↵ | Richard van der Hoff | 2018-08-02 | 2 | -129/+149 |
|\ \ | | | | | | | | | | | | | matrix-org/rav/refactor_federation_client_exception_handling Factor out exception handling in federation_client | ||||
| * | | changelog | Richard van der Hoff | 2018-08-01 | 1 | -0/+1 |
| |/ | |||||
| * | Factor out exception handling in federation_client | Richard van der Hoff | 2018-08-01 | 1 | -129/+148 |
| | | | | | | | | | | Factor out the error handling from make_membership_event, send_join, and send_leave, so that it can be shared. | ||||
* | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 11 | -21/+77 |
|\ \ | |||||
| * \ | Merge tag 'v0.33.1' | Richard van der Hoff | 2018-08-02 | 9 | -19/+73 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 0.33.1 (2018-08-02) =========================== SECURITY FIXES -------------- - Fix a potential issue where servers could request events for rooms they have not joined. (`#3641 <https://github.com/matrix-org/synapse/issues/3641>`_) - Fix a potential issue where users could see events in private rooms before they joined. (`#3642 <https://github.com/matrix-org/synapse/issues/3642>`_) | ||||
| | * | | changelog: this is a security release v0.33.1 github/release-v0.33.1 release-v0.33.1 | Richard van der Hoff | 2018-08-02 | 1 | -2/+2 |
| | | | | |||||
| | * | | fix changelog typos | Richard van der Hoff | 2018-08-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | Prepare 0.33.1 | Richard van der Hoff | 2018-08-02 | 4 | -3/+11 |
| | | | | |||||
| | * | | Merge pull request #3642 from matrix-org/rav/another_room_id_check | Richard van der Hoff | 2018-08-02 | 5 | -7/+25 |
| | |\ \ | | | | | | | | | | | Check room visibility for /event/ requests | ||||
| | | * | | changelogs | Richard van der Hoff | 2018-08-02 | 2 | -1/+2 |
| | | | | | |||||
| | | * | | Check room visibility for /event/ requests | Richard van der Hoff | 2018-08-02 | 3 | -6/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the user has permission to view the requeseted event for /event/{eventId} and /room/{roomId}/event/{eventId} requests. Also check that the event is in the given room for /room/{roomId}/event/{eventId}, for sanity. | ||||
| | * | | | Merge pull request #3641 from matrix-org/rav/room_id_check | Richard van der Hoff | 2018-08-02 | 5 | -12/+40 |
| | |\| | | | | | | | | | | | | Validation for events/rooms in fed requests | ||||
| | | * | | changelog | Richard van der Hoff | 2018-08-02 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Avoid extra db lookups | Richard van der Hoff | 2018-08-02 | 3 | -62/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Since we're about to look up the events themselves anyway, we can skip the extra db queries here. | ||||
| | | * | | Validation for events/rooms in fed requests | Richard van der Hoff | 2018-08-02 | 3 | -1/+64 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | When we get a federation request which refers to an event id, make sure that said event is in the room the caller claims it is in. (patch supplied by @turt2live) | ||||
| * | | | Merge pull request #3594 from matrix-org/richvdh-patch-1 | Richard van der Hoff | 2018-07-24 | 1 | -2/+3 |
| |\ \ \ | | | | | | | | | | | Update ISSUE_TEMPLATE.md | ||||
| | * | | | Update ISSUE_TEMPLATE.md | Richard van der Hoff | 2018-07-24 | 1 | -2/+3 |
| |/ / / | | | | | | | | | request backticks for logs | ||||
| * | | | Merge pull request #3377 from Valodim/note-affinity | Richard van der Hoff | 2018-07-19 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |/| | | document that the affinity package is required for the cpu_affinity setting | ||||
| | * | | add note that the affinity package is required for the cpu_affinity setting | Vincent Breitmoser | 2018-06-09 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_store | Erik Johnston | 2018-08-02 | 3 | -89/+101 |
|\ \ \ \ | | | | | | | | | | | Split out DB writes in federation handler | ||||
| * | | | | update docs | Erik Johnston | 2018-08-01 | 2 | -4/+6 |
| | | | | | |||||
| * | | | | _persist_auth_tree no longer returns anything | Erik Johnston | 2018-08-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-30 | 37 | -108/+787 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | erikj/split_fed_store | ||||
| * | | | | | Newsfile | Erik Johnston | 2018-07-27 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Split out DB writes in federation handler | Erik Johnston | 2018-07-25 | 2 | -85/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to easily add an internal replication API to proxy these reqeusts to master, so that we can move federation APIs to workers. | ||||
* | | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 11 | -16/+275 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Initial impl of capping MAU | ||||
| * | | | | | | count_monthly_users is now async | Neil Johnson | 2018-08-01 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | improve clarity | Neil Johnson | 2018-08-01 | 2 | -5/+6 |
| | | | | | | | |||||
| * | | | | | | fix isort | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | fix test for py3 | Neil Johnson | 2018-08-01 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-01 | 27 | -198/+5193 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sign_in_log_in_limits | ||||
| * | | | | | | | fix known broken test | Neil Johnson | 2018-08-01 | 1 | -25/+20 |
| | | | | | | | | |||||
| * | | | | | | | count_monthly_users() async | Neil Johnson | 2018-08-01 | 1 | -4/+7 |
| | | | | | | | | |||||
| * | | | | | | | remove need to plot limit_usage_by_mau | Neil Johnson | 2018-08-01 | 2 | -7/+6 |
| | | | | | | | | |||||
| * | | | | | | | remove errant print | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | make count_monthly_users async synapse/handlers/auth.py | Neil Johnson | 2018-08-01 | 4 | -38/+46 |
| | | | | | | | | |||||
| * | | | | | | | only need to loop if mau limiting is enabled | Neil Johnson | 2018-08-01 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | mau limts | Neil Johnson | 2018-07-31 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | coding style | Neil Johnson | 2018-07-31 | 7 | -9/+12 |
| | | | | | | | | |||||
| * | | | | | | | fix user_ips counting | Neil Johnson | 2018-07-31 | 1 | -9/+33 |
| | | | | | | | | |||||
| * | | | | | | | remove errant logging | Neil Johnson | 2018-07-30 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | actually close conn | Neil Johnson | 2018-07-30 | 1 | -4/+8 |
| | | | | | | | | |||||
| * | | | | | | | monthly_active_tests | Neil Johnson | 2018-07-30 | 1 | -0/+48 |
| | | | | | | | | |||||
| * | | | | | | | factor out metrics from __init__ to app/homeserver | Neil Johnson | 2018-07-30 | 2 | -25/+32 |
| | | | | | | | | |||||
| * | | | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 7 | -3/+166 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3620 from fuzzmz/return-404-room-not-found | Richard van der Hoff | 2018-08-01 | 3 | -3/+7 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | return 404 if room not found | ||||
| * | | | | | | Update 2952.bugfix | Richard van der Hoff | 2018-08-01 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | return NotFoundError if room not found | Serban Constantin | 2018-07-31 | 3 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the Client-Server API[0] we should return `M_NOT_FOUND` if the room isn't found instead of generic SynapseError. This ensures that /directory/list API returns 404 for room not found instead of 400. [0]: https://matrix.org/docs/spec/client_server/unstable.html#get-matrix-client-r0-directory-list-room-roomid Signed-off-by: Serban Constantin <serban.constantin@gmail.com> | ||||
* | | | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 17 | -67/+122 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3543 from bebehei/docker | Jan Christian Grünhage | 2018-08-01 | 4 | -10/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Improvements for Docker usage | ||||
| * | | | | | | [Docker] Use sorted multiline package lists | Benedikt Heine | 2018-07-19 | 2 | -3/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches docker best practices. Signed-off-by: Benedikt Heine <bebe@bebehei.de> | ||||
| * | | | | | | [Docker] Build docker image via compose | Benedikt Heine | 2018-07-17 | 2 | -7/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's much easier to build the image via docker-compose instead of an error-prone low-level docker call. Signed-off-by: Benedikt Heine <bebe@bebehei.de> | ||||
* | | | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layer | Richard van der Hoff | 2018-08-01 | 2 | -14/+15 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | rename replication_layer to federation_client | ||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-07-31 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | rename replication_layer to federation_client | Richard van der Hoff | 2018-07-31 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have HAD ENOUGH of trying to remember wtf a replication layer is in terms of classes. | ||||
* | | | | | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decorator | Richard van der Hoff | 2018-08-01 | 3 | -67/+166 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Rewrite cache list decorator | ||||
| * | | | | | | | fix invalidation | Richard van der Hoff | 2018-07-27 | 2 | -2/+42 |
| | | | | | | | | |||||
| * | | | | | | | Rewrite cache list decorator | Richard van der Hoff | 2018-07-27 | 3 | -67/+126 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because it was complicated and annoyed me. I suspect this will be more efficient too. | ||||
* | | | | | | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failures | Travis Ralston | 2018-07-31 | 7 | -97/+8 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Remove pdu_failures from transactions | ||||
| * | | | | | | | Remove pdu_failures from transactions | Travis Ralston | 2018-07-30 | 7 | -97/+8 |
| | |_|/ / / / | |/| | | | | | | | | | | | | The field is never read from, and all the opportunities given to populate it are not utilized. It should be very safe to remove this. | ||||
* | | | | | | | Merge pull request #3612 from matrix-org/rav/store_heirarchy | Richard van der Hoff | 2018-07-31 | 7 | -6/+11 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make EventStore inherit from EventFederationStore | ||||
| * | | | | | | | reinstate explicit include of EventsWorkerStore | Richard van der Hoff | 2018-07-31 | 1 | -1/+3 |
| | | | | | | | | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Make EventStore inherit from EventFederationStore | Richard van der Hoff | 2018-07-26 | 6 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (since it uses methods therein) Turns out that we had a bunch of things which were incorrectly importing EventWorkerStore from events.py rather than events_worker.py, which broke once I removed the import into events.py. | ||||
* | | | | | | | | Merge pull request #3629 from ptman/patch-1 | Richard van der Hoff | 2018-07-31 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add some documentation for using the dashboard | ||||
| * | | | | | | | | Add some documentation for using the dashboard | Paul Tötterman | 2018-07-31 | 1 | -0/+6 |
|/ / / / / / / / | |||||
* | | | | | | | | synapse grafana dashboard | Richard van der Hoff | 2018-07-31 | 1 | -0/+4961 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3626 from krombel/only_import_secrets_when_available | Amber Brown | 2018-07-31 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Only import secrets when available | ||||
| * | | | | | | | Only import secrets when available | Krombel | 2018-07-30 | 2 | -4/+4 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | secrets got introduced in python 3.6 so this class is not available in 3.5 and before. This now checks for the current running version and only tries using secrets if the version is 3.6 or above Signed-Off-By: Matthias Kesler <krombel@krombel.de> | ||||
* | / / / / / | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 5 | -7/+43 |
| |/ / / / / |/| | | | | | | | | | | | make /context lazyload & filter aware. | ||||
* | | | | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid | Richard van der Hoff | 2018-07-27 | 2 | -0/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | if inviter_display_name == ""||None then default to inviter MXID | ||||
| * | | | | | | add changelog entry for PR#3391 | Michael Telatynski | 2018-07-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | ||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Michael Telatynski | 2018-07-24 | 506 | -14810/+36527 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | t3chguy/default_inviter_display_name_3pid | ||||
| * | | | | | | | if inviter_display_name == ""||None then default to inviter MXID | Michael Telatynski | 2018-06-13 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to prevent email invite from "None" | ||||
* | | | | | | | | Merge pull request #3469 from DJViking/master | Richard van der Hoff | 2018-07-27 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add instructions for install on OpenSUSE and SLES | ||||
| * | | | | | | | | Add instructions for install on OpenSUSE and SLES | Sverre Moe | 2018-07-01 | 1 | -0/+13 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3616 from matrix-org/travis/event_id_send_leave | Richard van der Hoff | 2018-07-26 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update the send_leave path to be an event_id | ||||
| * | | | | | | | | | Create 3616.misc | Travis Ralston | 2018-07-26 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Update the send_leave path to be an event_id | Travis Ralston | 2018-07-26 | 1 | -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_content | Richard van der Hoff | 2018-07-26 | 4 | -2/+99 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Stop populating events.content | ||||
| * | | | | | | | | | | 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. | ||||
* | | | | | | | | | | | Deduplicate redundant lazy-loaded members (#3331) | Matthew Hodgson | 2018-07-26 | 3 | -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_id | Richard van der Hoff | 2018-07-26 | 3 | -8/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | Remove some redundant joins on event_edges.room_id | ||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-26 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Remove some redundant joins on event_edges.room_id | Richard van der Hoff | 2018-07-26 | 2 | -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_calls | Richard van der Hoff | 2018-07-26 | 13 | -15/+24 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Fix some looping_call calls which were broken in #3604 | ||||
| * | | | | | | | | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 13 | -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_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 |
| | | | | | | | | | | | | | | | | | | | |