summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Explain why auth/state necessary hereEric Eastwood2022-09-302-3/+19
|
* WIP: Connect state_chain to prev_event and the batch to the state_chain so ↵Eric Eastwood2022-09-293-11/+14
| | | | | | | everyhting is valid We are going to lose the benefit of keeping the join noise out of the timeline. And will probably have to hide "historical" state on the client.
* Seems to work with MariaEric Eastwood2022-09-293-21/+86
|
* Working once you connect the floating insertion eventEric Eastwood2022-09-293-25/+80
|
* Simplify case more (no more alice)Eric Eastwood2022-09-281-10/+2
|
* Simplify caseEric Eastwood2022-09-281-41/+17
|
* Try chronolgoical which rejects the historicalEric Eastwood2022-09-281-2/+4
|
* I think working same as Complement reverse_chronological, only the insertion ↵Eric Eastwood2022-09-284-35/+143
| | | | event rejected
* Align more to Complement test which does passEric Eastwood2022-09-281-16/+59
|
* Show extra unepexpected eventsEric Eastwood2022-09-282-5/+27
|
* Use event_id to compareEric Eastwood2022-09-271-3/+3
|
* Better assertion messageEric Eastwood2022-09-271-24/+87
|
* Test running but no expected results yetEric Eastwood2022-09-271-3/+31
|
* Non-working testEric Eastwood2022-09-273-3/+174
|
* Merge branch 'madlittlemods/13356-messages-investigation-scratch-v1' into ↵Eric Eastwood2022-09-2676-306/+3735
|\ | | | | | | | | | | | | | | | | maddlittlemods/msc2716-many-batches-optimization Conflicts: synapse/handlers/federation.py synapse/storage/databases/main/cache.py synapse/storage/databases/main/event_federation.py
| * Merge branch 'madlittlemods/11850-migrate-to-opentelemetry' into ↵Eric Eastwood2022-09-26118-492/+4784
| |\ | | | | | | | | | madlittlemods/13356-messages-investigation-scratch-v1
| | * Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetryEric Eastwood2022-09-26118-492/+4784
| | |\
| | | * Improve tests for get_unread_push_actions_for_user_in_range_*. (#13893)Patrick Cloke2022-09-263-30/+97
| | | | | | | | | | | | | | | | | | | | * Adds a docstring. * Reduces a small amount of duplicated code. * Improves tests.
| | | * Update the manpage documentation for the hash_password script (#13911)Andrew Morgan2022-09-263-1/+9
| | | |
| | | * Snapshot schema 72 (#13873)David Robertson2022-09-2613-22/+2165
| | | | | | | | | | | | Including another batch of fixes to the schema dump script
| | | * typing: check origin server of typing event against room's servers (#13830)Mathieu Velten2022-09-263-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is also using the partial state approximation if needed so we do not block here during a fast join. Signed-off-by: Mathieu Velten <mathieuv@matrix.org> Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>
| | | * Simplify cache invalidation after event persist txn (#13796)Nick Mills-Barrett2022-09-264-119/+52
| | | | | | | | | | | | | | | | | | | | This moves all the invalidations into a single place and de-duplicates the code involved in invalidating caches for a given event by using the base class method.
| | | * Update NixOS module URL (#13818)enterprisey2022-09-262-1/+2
| | | | | | | | | | | | | | | | | | | | * Update NixOS module URL * Create 13818.doc
| | | * Correctly add Cargo.lock to sdsit (#13909)Erik Johnston2022-09-262-1/+2
| | | |
| | | * Fix mypy errors with latest canonicaljson (#13905)David Robertson2022-09-263-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Lockfile: update canonicaljson 1.6.0 -> 1.6.3 * Fix mypy errors with latest canonicaljson The change to `_encode_json_bytes` definition wasn't sufficient: ``` synapse/http/server.py:751: error: Incompatible types in assignment (expression has type "Callable[[Arg(object, 'json_object')], bytes]", variable has type "Callable[[Arg(object, 'data')], bytes]") [assignment] ``` Which I think is mypy warning us that the two functions accept different sets of kwargs. Fair enough! * Changelog
| | | * Only try to backfill event if we haven't tried before recently (#13635)Eric Eastwood2022-09-234-48/+626
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only try to backfill event if we haven't tried before recently (exponential backoff). No need to keep trying the same backfill point that fails over and over. Fix https://github.com/matrix-org/synapse/issues/13622 Fix https://github.com/matrix-org/synapse/issues/8451 Follow-up to https://github.com/matrix-org/synapse/pull/13589 Part of https://github.com/matrix-org/synapse/issues/13356
| | | * Faster room joins: Avoid blocking `/keys/changes` (#13888)Sean Quah2022-09-233-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of the work for #12993. Once #12993 is fully resolved, we expect `/keys/changes` to behave sensibly when joined to a room with partial state. Signed-off-by: Sean Quah <seanq@matrix.org>
| | | * Fix access token leak to logs from proxyagent (#13855)Eric Eastwood2022-09-232-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can happen specifically with an application service `/transactions/10722?access_token=leaked` request Fix https://github.com/matrix-org/synapse/issues/13010 --- Saw an example leak in https://github.com/matrix-org/synapse/issues/13423#issuecomment-1205348482 ``` 2022-08-04 14:47:57,925 - synapse.http.client - 401 - DEBUG - as-sender-signal-1 - Sending request PUT http://localhost:29328/transactions/10722?access_token=<redacted> 2022-08-04 14:47:57,926 - synapse.http.proxyagent - 223 - DEBUG - as-sender-signal-1 - Requesting b'http://localhost:29328/transactions/10722?access_token=leaked' via <HostnameEndpoint localhost:29328> ```
| | | * Update Cargo.lock file. (#13889)Patrick Cloke2022-09-232-10/+153
| | | |
| | | * Accept & store thread IDs for receipts (implement MSC3771). (#13782)Patrick Cloke2022-09-2317-41/+173
| | | | | | | | | | | | | | | | Updates the `/receipts` endpoint and receipt EDU handler to parse a `thread_id` from the body and insert it in the database.
| | | * Send device list updates out to servers in partially joined rooms (#13874)Sean Quah2022-09-234-2/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the provided list of servers in the room from the `/send_join` response, since we will not know which users are in the room. This isn't sufficient to ensure that all remote servers receive the right device list updates, since the `/send_join` response may be inaccurate or we may calculate the membership state of new users in the room incorrectly. Signed-off-by: Sean Quah <seanq@matrix.org>
| | | * Faster Remote Room Joins: tell remote homeservers that we are unable to ↵reivilibre2022-09-2311-42/+58
| | | | | | | | | | | | | | | | authorise them if they query a room which has partial state on our server. (#13823)
| | | * Add comments to the Prometheus recording rules to make it clear which set of ↵reivilibre2022-09-232-7/+19
| | | | | | | | | | | | | | | | rules you need for Grafana or Prometheus Console. (#13876)
| | | * Merge branch 'release-v1.68' into developErik Johnston2022-09-238-10/+360
| | | |\
| | | | * Move warnings up v1.68.0rc2Erik Johnston2022-09-231-7/+7
| | | | |
| | | | * 1.68.0rc2Erik Johnston2022-09-237-5/+24
| | | | |
| | | | * Fix sdist to include rust build script (#13866)Erik Johnston2022-09-222-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix sdist to include rust build script Fixes #13851 * Newsfile
| | | | * Fix the release script not publishing binary wheels. (#13850)reivilibre2022-09-212-11/+35
| | | | |
| | | | * Lock rust dependencies (#13858)Erik Johnston2022-09-214-1/+328
| | | | |
| | | | * Lower minimum rustc version to 1.58.1 (#13857)Erik Johnston2022-09-213-7/+8
| | | | |
* | | | | More debuggingEric Eastwood2022-09-242-8/+142
| | | | |
* | | | | DebuggingEric Eastwood2022-09-242-3/+25
| | | | |
* | | | | Merge branch ↵Eric Eastwood2022-09-2354-175/+1093
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'madlittlemods/13856-fix-have-seen-events-not-being-invalidated' into maddlittlemods/msc2716-many-batches-optimization Conflicts: tests/storage/databases/main/test_events_worker.py
| * | | | | Add test to ensure the safety worksEric Eastwood2022-09-221-1/+32
| | | | | |
| * | | | | Raise exception so we don't run into this arg mismatch againEric Eastwood2022-09-221-0/+6
| | | | | |
| * | | | | Add test to make sure we can actually clear entries just by room_idEric Eastwood2022-09-221-1/+28
| | | | | |
| * | | | | Better changelogEric Eastwood2022-09-221-1/+1
| | | | | |
| * | | | | Add test descriptionEric Eastwood2022-09-221-0/+5
| | | | | |
| * | | | | Fix `@cachedList` on `_have_seen_events_dict`Eric Eastwood2022-09-222-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned by @erikjohnston, https://github.com/matrix-org/synapse/issues/13865#issuecomment-1254751569
| * | | | | Invalidate cache like #13796Eric Eastwood2022-09-222-33/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copying what https://github.com/matrix-org/synapse/pull/13796 is doing
| * | | | | Merge branch 'develop' into ↵Eric Eastwood2022-09-228-16/+65
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | madlittlemods/13856-fix-have-seen-events-not-being-invalidated
| | * | | | Raise issue if complement fails with latest deps (#13859)David Robertson2022-09-222-1/+3
| | | | | |
| | * | | | Fix the cross-link from register admin API to config docs. (#13870)Patrick Cloke2022-09-222-1/+2
| | | | | |
| | * | | | Properly paginate forward in the /relations API. (#13840)Patrick Cloke2022-09-224-14/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where the `/relations` API with `dir=f` would skip the first item of each page (except the first page), causing incomplete data to be returned to the client.
| * | | | | Assert is not NoneEric Eastwood2022-09-211-2/+2
| | | | | |
| * | | | | Add changelogEric Eastwood2022-09-211-0/+1
| | | | | |
| * | | | | Fix `have_seen_event` cache not being invalidatedEric Eastwood2022-09-213-50/+106
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://github.com/matrix-org/synapse/issues/13856 `_invalidate_caches_for_event` doesn't run in monolith mode which means we never even tried to clear the `have_seen_event` and other caches. And even in worker mode, it only runs on the workers, not the master (AFAICT). Additionally there is bug with the key being wrong so `_invalidate_caches_for_event` never invalidates the `have_seen_event` cache even when it does run. Wrong: ```py self.have_seen_event.invalidate((room_id, event_id)) ``` Correct: ```py self.have_seen_event.invalidate(((room_id, event_id),)) ```
| * | | | Last batch of Pydantic for synapse/rest/client/account.py (#13832)David Robertson2022-09-212-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Validation for `/add_threepid/msisdn/submit_token` * Don't validate deprecated endpoint * Changelog
| * | | | Add version flag for MSC3881 (#13860)Brendan Abolivier2022-09-212-0/+3
| | | | |
| * | | | Track device IDs for pushers (#13831)Brendan Abolivier2022-09-217-10/+154
| | | | | | | | | | | | | | | Second half of the MSC3881 implementation
| * | | | Implementation of MSC3882 login token request (#13722)Hugh Nimmo-Smith2022-09-216-0/+238
| | | | |
| * | | | Add `worker_main_http_uri` to the contrib bash script (#13772)villepeh2022-09-212-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add worker_main_http_uri, replace >> with > Co-authored-by: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Co-authored-by: Erik Johnston <erik@matrix.org>
| * | | | Support enabling/disabling pushers (from MSC3881) (#13799)Brendan Abolivier2022-09-2115-71/+294
| | | | | | | | | | | | | | | Partial implementation of MSC3881
| * | | | Add cache invalidation across workers to module API (#13667)Mathieu Velten2022-09-217-21/+153
| | | | | | | | | | | | | | | Signed-off-by: Mathieu Velten <mathieuv@matrix.org>
| * | | | Correct documentation for map_user_attributes of OpenID Mapping Providers ↵Peter Scheu2022-09-213-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | (#13836) Co-authored-by: David Robertson <davidr@element.io>
| * | | | Improve the `synapse.api.auth.Auth` mock used in unit tests. (#13809)Quentin Gliech2022-09-212-26/+11
| | | | | | | | | | | | | | | To return the proper type (`Requester`) instead of a `dict`.
| * | | | Fix the release script not publishing binary wheels. (#13850)reivilibre2022-09-212-11/+35
| | | | |
* | | | | Scratch try different orders just to see how the tests pass differentlyEric Eastwood2022-09-222-1/+3
| | | | |
* | | | | Try sort backfill points by tie breaking on stream_orderingEric Eastwood2022-09-223-112/+220
| | | | |
* | | | | Calculate the stream_ordering from newest -> oldest (in the correct order) ↵Eric Eastwood2022-09-213-3/+36
| | | | | | | | | | | | | | | | | | | | and persist in the oldest -> newest to get the least missing prev_event fetch thrashing
* | | | | Fix `have_seen_event` cache not being invalidatedEric Eastwood2022-09-213-50/+106
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://github.com/matrix-org/synapse/issues/13856 `_invalidate_caches_for_event` doesn't run in monolith mode which means we never even tried to clear the `have_seen_event` and other caches. And even in worker mode, it only runs on the workers, not the master (AFAICT). Additionally there is bug with the key being wrong so `_invalidate_caches_for_event` never invalidates the `have_seen_event` cache even when it does run. Wrong: ```py self.have_seen_event.invalidate((room_id, event_id)) ``` Correct: ```py self.have_seen_event.invalidate(((room_id, event_id),)) ```
* | | | Merge branch 'madlittlemods/11850-migrate-to-opentelemetry' into ↵Eric Eastwood2022-09-20310-4035/+8726
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | madlittlemods/13356-messages-investigation-scratch-v1 Conflicts: poetry.lock synapse/handlers/federation.py
| * | | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetryEric Eastwood2022-09-20108-1062/+2164
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .github/workflows/tests.yml poetry.lock synapse/storage/schema/__init__.py
| | * | Merge branch 'release-v1.68' into developOlivier Wilkinson (reivilibre)2022-09-2070-68/+105
| | |\|
| | | * Tweak changelog v1.68.0rc1Olivier Wilkinson (reivilibre)2022-09-201-1/+1
| | | |
| | | * Edit description of cache invalidation bugOlivier Wilkinson (reivilibre)2022-09-201-1/+1
| | | |
| | | * Edit changelog in response to feedbackOlivier Wilkinson (reivilibre)2022-09-202-7/+21
| | | |
| | | * 1.68.0rc1Olivier Wilkinson (reivilibre)2022-09-2069-67/+90
| | | |
| | * | Remove the `complete_sso_login` method from the Module API which was ↵Quentin Gliech2022-09-203-58/+2
| | | | | | | | | | | | | | | | | | | | deprecated in Synapse 1.13.0. (#13843) Signed-off-by: Quentin Gliech <quenting@element.io>
| | * | Generate separate snapshots for logical databases (#13792)David Robertson2022-09-204-46/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Generate separate snapshots for sqlite, postgres and common * Cleanup postgres dbs in the TRAP * Say which logical DB we're applying updates to * Run background updates on the state DB * Add new option for accepting a SCHEMA_NUMBER
| | * | Port the push rule classes to Rust. (#13768)Erik Johnston2022-09-2014-615/+930
| | |/
| | * Don't include redundant prev_state in new events (#13791)Denis2022-09-203-4/+1
| | |
| | * Add support to purge rows from MSC2716 and other tables when purging a room ↵Eric Eastwood2022-09-164-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#13825) `event_failed_pull_attempts` added in https://github.com/matrix-org/synapse/pull/13589 MSC2716 related tables added in: - https://github.com/matrix-org/synapse/pull/10245/files#diff-3d42dfb44d02f7de3aada105e0bdc1cc9dd7f953cbf0f36c5d0f50827bf0320aR1 - Renamed in https://github.com/matrix-org/synapse/pull/10838/files#diff-2730bfbe9e688b55e46f9371aefe67dac2bd2b2b7d9d6b92774eea1fcfae156dR1 - https://github.com/matrix-org/synapse/pull/10498/files#diff-c52bbfbb5921a3f6f023b24343668479d966fac164f13b7c39d2197ce3afa7a5R1
| | * Fix Docker build when Rust .so has been build locally first (#13811)Mathieu Velten2022-09-163-3/+7
| | | | | | | | | Signed-off-by: Mathieu Velten <mathieuv@matrix.org>
| | * Compare ported to unported PG schemas in portdb test job (#13808)David Robertson2022-09-165-47/+50
| | |
| | * Minor speedups to CI linting (#13827)David Robertson2022-09-162-4/+6
| | |
| | * Remove error spam when users query the keys of departed remote users (#13826)Sean Quah2022-09-162-9/+13
| | | | | | | | | | | | The error message introduced in #13749 has turned out to be very spammy. Remove it for now.
| | * complement: init postgres DB directly inside the target image (#13819)Mathieu Velten2022-09-162-11/+10
| | | | | | | | | | | | | | | | | | | | | Doing so in the base postgres image doesn't work with buildah because changes in a declared VOLUME in the Dockerfile is supposed to be discarded, cf https://docs.docker.com/engine/reference/builder/#volume Signed-off-by: Mathieu Velten <mathieuv@matrix.org>
| | * Add an admin API endpoint to find a user based on its external ID in an auth ↵Quentin Gliech2022-09-165-0/+155
| | | | | | | | | | | | provider. (#13810)
| | * Update request log format documentation to mention the format used when the ↵reivilibre2022-09-162-2/+3
| | | | | | | | | | | | authenticated user is controlling another user. (#13794)
| | * Avoid putting rejected events in room state (#13723)Sean Quah2022-09-163-0/+415
| | | | | | | | | Signed-off-by: Sean Quah <seanq@matrix.org>
| | * Document common fix of Poetry problems by removing egg-info (#13785)Eric Eastwood2022-09-152-0/+28
| | | | | | | | | | | | | | | `matrix_synapse.egg-info/` Mentioned at https://matrix.to/#/!vcyiEtMVHIhWXcJAfl:sw1v.org/$aKy_IjrKwb70aTVZWeW_6zt0k7OIZ1YkyZpkP9uiRaM?via=matrix.org&via=element.io&via=beeper.com and many other places.
| | * Be able to correlate timeouts in reverse-proxy layer in front of Synapse ↵Eric Eastwood2022-09-155-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (pull request ID from header) (#13801) Fix https://github.com/matrix-org/synapse/issues/13685 New config: ```diff listeners: - port: 8008 tls: false type: http x_forwarded: true + request_id_header: "cf-ray" bind_addresses: ['::1', '127.0.0.1', '0.0.0.0'] ```
| | * Record any exception when processing a pulled event (#13814)Eric Eastwood2022-09-153-1/+12
| | | | | | | | | | | | | | | Part of https://github.com/matrix-org/synapse/issues/13700 and https://github.com/matrix-org/synapse/issues/13356 Follow-up to https://github.com/matrix-org/synapse/pull/13589
| | * Support providing an index predicate for upserts. (#13822)Patrick Cloke2022-09-153-7/+25
| | | | | | | | | | | | This is useful to upsert against a table which has a unique partial index while avoiding conflicts.
| | * A third batch of Pydantic validation for rest/client/account.py (#13736)David Robertson2022-09-154-45/+78
| | |
| | * Add a `MXCUri` class to make working with mxc uri's easier. (#13162)Andrew Morgan2022-09-156-74/+53
| | |
| * | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetryEric Eastwood2022-09-1438-121/+783
| |\| | | | | | | | | | | | | Conflicts: synapse/storage/schema/__init__.py
| | * Keep track when we try and fail to process a pulled event (#13589)Eric Eastwood2022-09-147-9/+329
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can follow-up this PR with: 1. Only try to backfill from an event if we haven't tried recently -> https://github.com/matrix-org/synapse/issues/13622 1. When we decide to backfill that event again, process it in the background so it doesn't block and make `/messages` slow when we know it will probably fail again -> https://github.com/matrix-org/synapse/issues/13623 1. Generally track failures everywhere we try and fail to pull an event over federation -> https://github.com/matrix-org/synapse/issues/13700 Fix https://github.com/matrix-org/synapse/issues/13621 Part of https://github.com/matrix-org/synapse/issues/13356 Mentioned in [internal doc](https://docs.google.com/document/d/1lvUoVfYUiy6UaHB6Rb4HicjaJAU40-APue9Q4vzuW3c/edit#bookmark=id.qv7cj51sv9i5)
| | * Update event push action and receipt tables to support threads. (#13753)Patrick Cloke2022-09-1411-20/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a `thread_id` column to the `event_push_actions`, `event_push_actions_staging`, and `event_push_summary` tables. This will notifications to be segmented by the thread in a future pull request. The `thread_id` column stores the root event ID or the special value `"main"`. The `thread_id` column for `event_push_actions` and `event_push_summary` is backfilled with `"main"` for all existing rows. New entries into `event_push_actions` and `event_push_actions_staging` will get the proper thread ID. `receipts_linearized` and `receipts_graph` also gain a `thread_id` column, which is similar, except `NULL` is a special value meaning the receipt is "unthreaded". See MSC3771 and MSC3773 for where this data will be useful.
| | * Use partial indices on SQLIte. (#13802)Patrick Cloke2022-09-144-5/+59
| | | | | | | | | | | | | | | | | | | | | Partial indices have been supported since SQLite 3.8, but Synapse now requires >= 3.27, so we can enable support for them. This requires rebuilding previous indices which were partial on PostgreSQL, but not on SQLite.
| | * Deduplicate `is_server_notices_room`. (#13780)reivilibre2022-09-144-18/+20
| | |
| | * Fix a memory leak when running the unit tests. (#13798)reivilibre2022-09-143-6/+8
| | |
| | * Remove unused method in `synapse.api.auth.Auth`. (#13795)Quentin Gliech2022-09-142-9/+1
| | | | | | | | | | | | | | | Clean-up from b19060a29b4f73897847db2aba5d03ec819086e0 (#13094) and 73af10f419346a5f2d70131ac1ed8e69942edca0 (#13093) which removed all callers.
| | * Remove incorrect migration file from `state` logical DB (#13788)David Robertson2022-09-142-37/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove incorrect migration file from `state` logical DB The table `ex_outlier_stream` is part of the `main` logical DB; it should not have been created in the `state` logical DB. We remove this migration now as a tidy-up. Note: we cannot `DROP TABLE IF EXISTS ex_outlier_stream` in a new migration, because some (most) instances of Synapse host both of these logical DBs on the same DB cluster. * Changelog
| | * Fix bug in device list caching when remote users leave rooms (#13749)Sean Quah2022-09-145-15/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a remote user leaves the last room shared with the homeserver, we have to mark their device list as unsubscribed, otherwise we would hold on to a stale device list in our cache. Crucially, the device list would remain cached even after the remote user rejoined the room, which could lead to E2EE failures until the next change to the remote user's device list. Fixes #13651. Signed-off-by: Sean Quah <seanq@matrix.org>
| | * Fix a long-standing spec compliance bug where Synapse would accept a ↵reivilibre2022-09-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trailing slash on the end of `/get_missing_events` federation requests. (#13789) * Don't accept a trailing slash on the end of /get_missing_events * Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org> Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
| * | Maybe fix positional argument mismatch for DummyLinkEric Eastwood2022-09-141-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully fix: ``` File "/home/runner/work/synapse/synapse/synapse/storage/controllers/persist_events.py", line 246, in add_to_queue links=[Link(end_item.tracing_span_context)], builtins.TypeError: __init__() takes 1 positional argument but 2 were given ```
| * | Hopefully fix problem when OTEL not installed with non recording spanEric Eastwood2022-09-133-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` Traceback (most recent call last): File "/usr/local/lib/python3.9/site-packages/synapse/http/server.py", line 306, in _async_render_wrapper callback_return = await self._async_render(request) File "/usr/local/lib/python3.9/site-packages/synapse/http/server.py", line 512, in _async_render callback_return = await raw_callback_return File "/usr/local/lib/python3.9/site-packages/synapse/federation/transport/server/_base.py", line 357, in new_func remote_parent_span = create_non_recording_span() File "/usr/local/lib/python3.9/site-packages/synapse/logging/tracing.py", line 502, in create_non_recording_span return opentelemetry.trace.NonRecordingSpan( AttributeError: 'NoneType' object has no attribute 'trace' ```
| * | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetryEric Eastwood2022-09-1370-94/+290
| |\| | | | | | | | | | | | | Conflicts: synapse/storage/schema/__init__.py
| | * Make sequence `cache_invalidation_stream_seq` begin at `2` (#13766)Mathieu Velten2022-09-133-0/+25
| | | | | | | | | | | | Signed-off-by: Mathieu Velten <mathieuv@matrix.org> Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>
| | * Merge branch 'master' into developErik Johnston2022-09-1357-56/+145
| | |\
| | | * Fixup changelog v1.67.0Erik Johnston2022-09-131-3/+3
| | | |
| | | * 1.67.0Erik Johnston2022-09-133-3/+15
| | | |
| | | * Also cite upgrade notesDavid Robertson2022-09-081-1/+1
| | | |
| | | * Add minimum version bump for sqlite to the release notes (#13742)David Robertson2022-09-082-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | * Notify that SQLite min version will be bumped * Mention in upgrade notes Co-authored-by: reivilibre <oliverw@matrix.org>
| | | * Fixup changelog v1.67.0rc1Erik Johnston2022-09-061-2/+2
| | | |
| | | * Update changelogErik Johnston2022-09-062-0/+22
| | | |
| | | * 1.67.0rc1Erik Johnston2022-09-0656-56/+91
| | | |
| | * | Updates to the schema dump script (#13770)David Robertson2022-09-133-32/+21
| | | |
| | * | Simplify CI tests DAG (#13784)David Robertson2022-09-132-4/+1
| | | | | | | | | | | | | | | | | | | | * Simplify CI tests DAG * Changelog
| | * | installation.md: require libpq on M1 macs (#13480)Richard van der Hoff2022-09-132-2/+4
| | | |
| | * | Add receipts event stream ordering (#13703)Nick Mills-Barrett2022-09-134-1/+95
| | | |
| * | | Remove linting from CI for nowEric Eastwood2022-09-131-82/+82
| | | |
| * | | Update Twisted to lastestEric Eastwood2022-09-131-15/+16
| | | |
| * | | OTEL install with DMREric Eastwood2022-09-132-116/+4
| | | |
| * | | Install otel deps from developEric Eastwood2022-09-121-774/+786
| | | |
| * | | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetryEric Eastwood2022-09-1215-158/+256
| |\| |
| | * | Fix GHA skippable syntax (#13778)Mathieu Velten2022-09-122-1/+3
| | | | | | | | | | | | Signed-off-by: Mathieu Velten <mathieuv@matrix.org>
| | * | Fix typo in ratelimiting documentation (#13727)Brendan Abolivier2022-09-122-1/+2
| | | |
| | * | Fix CI on non-PR builds (#13769)Erik Johnston2022-09-122-0/+2
| | | | | | | | | | | | Mark cargo-test as skippable since it only runs on Rust code change.
| | * | Remove check current state membership up to date (#13745)Nick Mills-Barrett2022-09-123-155/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove checks for membership column in current_state_events * Add schema script to force through the `current_state_events_membership` background job Contributed by Nick @ Beeper (@fizzadar).
| | * | Check if Rust lib needs rebuilding. (#13759)Erik Johnston2022-09-127-1/+149
| | | | | | | | | | | | This protects against the common mistake of failing to remember to rebuild Rust code after making changes.
| * | | poetry updateEric Eastwood2022-09-091-681/+781
| | | |
| * | | Poetry install againEric Eastwood2022-09-091-63/+92
| | | |
| * | | Try to resolve poetry depsEric Eastwood2022-09-092-204/+274
| | | |
| * | | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetryEric Eastwood2022-09-09347-2934/+5468
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: poetry.lock synapse/api/auth.py synapse/federation/federation_client.py synapse/logging/opentracing.py synapse/rest/client/keys.py synapse/rest/client/sendtodevice.py synapse/storage/schema/__init__.py
| | * | Concurrently collect room unread counts for push badges (#13765)Nick Mills-Barrett2022-09-092-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the time this function is heavily cached, but when that isn't the case fetching the counts room by room slows down push delivery on users with many (thousands) of rooms. Signed off by Nick @ Beeper.
| | * | Tag trace with instance name (#13761)Eric Eastwood2022-09-093-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We tag the Synapse instance name so that it's an easy jumping off point into the logs. Can also be used to filter for an instance that is under load. As suggested by @clokep and @reivilibre in, - https://github.com/matrix-org/synapse/pull/13729#discussion_r964719258 - https://github.com/matrix-org/synapse/pull/13729#discussion_r964733578
| | * | Strip number suffix from instance name to consolidate services that traces ↵Eric Eastwood2022-09-092-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are spread over (#13729) The problem with many services is that it makes it hard to find which service has the trace you want, see https://github.com/jaegertracing/jaeger-ui/issues/985 Previously, we split traces out into services based on their instance name like `matrix.org client_reader-1`, etc but there are many worker instances of the same `client_reader` so there is a lot to click through. With this PR, all of the traces are just collected under the worker type like `client_reader`, `event_persister` 😇 Note: A Synapse worker instance name is an opaque string with the number convention only being our own thing for the `matrix.org` deployment. But seems pretty sensible to group things this way.
| | * | Use an upsert for `receipts_graph`. (#13752)Patrick Cloke2022-09-092-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | Instead of a delete, then insert. This was previously done for `receipts_linearized` in 2dc430d36ef793b38d6d79ec8db4ea60588df2ee (#7607).
| | * | Add rust to CI (#13763)Erik Johnston2022-09-093-1/+84
| | | |
| | * | Require SQLite >= 3.27.0 (#13760)David Robertson2022-09-099-208/+106
| | | |
| | * | Re-type hint some collections in `/sync` code as read-only (#13754)Sean Quah2022-09-082-10/+11
| | | | | | | | | | | | | | | | Signed-off-by: Sean Quah <seanq@matrix.org>
| | * | Remove unused Prometheus recording rules from `synapse-v2.rules` and add ↵reivilibre2022-09-082-23/+9
| | | | | | | | | | | | | | | | comments describing where the rest are used. (#13756)
| | * | Add timestamp to user's consent (#13741)Dirk Klimpel2022-09-087-8/+52
| | | | | | | | | | | | Co-authored-by: reivilibre <olivier@librepush.net>
| | * | Update docstrings to explain the impact of partial state (#13750)Sean Quah2022-09-082-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the docstrings for `get_users_in_room` and `get_current_hosts_in_room` to explain the impact of partial state. Signed-off-by: Sean Quah <seanq@matrix.org>
| | * | Avoid raising errors due to malformed IDs in `get_current_hosts_in_room` ↵Sean Quah2022-09-082-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#13748) Handle malformed user IDs with no colons in `get_current_hosts_in_room`. It's not currently possible for a malformed user ID to join a room, so this error would never be hit. Signed-off-by: Sean Quah <seanq@matrix.org>
| | * | Fix error in `is_mine_id` when encountering a malformed ID (#13746)Sean Quah2022-09-083-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, `is_mine_id` would raise an exception when passed an ID with no colons. Return `False` instead. Fixes #13040. Signed-off-by: Sean Quah <seanq@matrix.org>
| | * | Fix cache metrics not being updated when not using the legacy exposition ↵reivilibre2022-09-084-21/+81
| | | | | | | | | | | | | | | | module. (#13717)
| | * | Fix Prometheus recording rules to not use legacy metric names. (#13718)reivilibre2022-09-086-37/+22
| | | |
| | * | Fix latest deps (#13743)Erik Johnston2022-09-082-0/+15
| | | |
| | * | Fix a bug where Synapse fails to start if a signing key file contains an ↵reivilibre2022-09-082-1/+13
| | | | | | | | | | | | | | | | empty line. (#13738)
| | * | Instrument `get_metadata_for_events` for tracing (#13730)Eric Eastwood2022-09-072-0/+3
| | | | | | | | | | | | | | | | When backfilling, `_get_state_ids_after_missing_prev_event` calls [`get_metadata_for_events`](https://github.com/matrix-org/synapse/blob/26bc26586b4b95d63ce7e453e9312469843f796e/synapse/handlers/federation_event.py#L1133). For `#matrix:matrix.org`, it's called with 77k `state_events` which means 77 calls to the database and takes 28 seconds.
| | * | Fix latest deps CI (#13734)Erik Johnston2022-09-073-3/+42
| | | |
| | * | Add some rust caching to CI (#13735)Erik Johnston2022-09-072-0/+6
| | | |
| | * | Correct out-of-date doc for `event_cache_size` (#13726)David Robertson2022-09-072-2/+5
| | | |
| | * | Define SQLite compat policy (#13728)David Robertson2022-09-072-4/+12
| | | |
| | * | A second batch of Pydantic models for rest/client/account.py (#13687)David Robertson2022-09-074-34/+64
| | | |
| | * | Cancel the processing of key query requests when they time out. (#13680)reivilibre2022-09-0718-20/+110
| | | |
| | * | Rename the `EventFormatVersions` enum values so that they line up with room ↵reivilibre2022-09-0713-41/+47
| | | | | | | | | | | | | | | | version numbers. (#13706)
| | * | Add Admin API to Fetch Messages Within a Particular Window (#13672)Connor Davis2022-09-076-14/+435
| | | | | | | | | | | | This adds two new admin APIs that allow us to fetch messages from a room within a particular time.
| | * | Remove the unspecced room_id field in the /hierarchy response. (#13506)reivilibre2022-09-062-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a re-do of 57d334a13d983406ea452dfa203bbe4837509c4e (#13365), which was backed out in 12abd724974a2311d5311272d26d2f8aa11734a9 (#13501). The `room_id` field represented the parent space for each room and was made redundant by changes in the API shape where the `children_state` is now nested underneath each `room`. The room ID of each child is in the `state_key` field and is still available.
| | * | Add a stub Rust crate (#12595)Erik Johnston2022-09-0623-11/+302
| | | |
| | * | Fix trial-olddeps (#13725)Erik Johnston2022-09-063-2/+3
| | | |
| | * | Actually fix typechecking with latest types-jsonschema (#13724)David Robertson2022-09-062-4/+5
| | | |
| | * | Update trial old deps CI to use poetry 1.2.0 (#13707)Erik Johnston2022-09-063-29/+42
| | | |
| | * | Update Grafana dashboard to not use legacy metric names. (#13714)reivilibre2022-09-064-73/+74
| | |/
| | * Remove configuration options for direct TCP replication. (#13647)Patrick Cloke2022-09-0612-78/+63
| | | | | | | | | Removes the ability to configure legacy direct TCP replication. Workers now require Redis to run.
| | * Reduce number of CI jobs run on PRs (#13713)Erik Johnston2022-09-053-66/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reduce number of CI jobs run on PRs * Newsfile * Also limit sytest jobs * Fix typo * Fix up * Fixup
| | * Extend the release script to wait for GitHub Actions to finish and to be ↵reivilibre2022-09-052-4/+143
| | | | | | | | | | | | usable as a guide for the whole process. (#13483)
| | * Fix typechecking with latest `types-jsonschema` (#13712)David Robertson2022-09-052-4/+5
| | |
| | * Share some metrics between the Prometheus exporter and the phone home stats ↵Brendan Abolivier2022-09-056-4/+146
| | | | | | | | | | | | (#13671)
| | * fix grammarMatthew Hodgson2022-09-031-1/+1
| | |
| | * Clarify `(room_id, event_id)` global uniqueness (#13701)Eric Eastwood2022-09-022-0/+25
| | | | | | | | | Summarized from @richvdh's reply at https://github.com/matrix-org/synapse/pull/13589#discussion_r961116999
| | * Update docs to make enabling metrics more clear (#13678)Eric Eastwood2022-09-022-4/+8
| | | | | | | | | It was really easy to miss the `enable_metrics: True` step with the previous language.
| | * Update lock file for Poetry v1.2.0 (#13689)Erik Johnston2022-09-025-66/+99
| | |
| | * Only run trial CI on all python versions on non-PRs (#13698)Erik Johnston2022-09-022-0/+11
| | |
| | * Fix two typos with colon in headlines (#13665)Dirk Klimpel2022-09-012-2/+3
| | |
| | * Add a schema delta to drop unstable private read receipts. (#13692)Patrick Cloke2022-09-012-0/+20
| | | | | | | | | | | | Otherwise they'll be leaked due to the filtering code only respecting the stable identifiers for private read receipts.
| | * Disable calculating unread counts unless the config flag is enabled. (#13694)Patrick Cloke2022-09-014-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | This avoids doing work that will never be used (since the resulting unread counts will never be sent in a /sync response). The negative of doing this is that unread counts will be incorrect when the feature is initially enabled.
| | * Update the Grafana dashboard that is included with Synapse in the `contrib` ↵reivilibre2022-09-012-20/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory. (#13697) * Add missing graph to contrib * Update with minor but plausible changes, including positioning changes * Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org> Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
| | * Cache `is_partial_state_room` (#13693)Erik Johnston2022-09-012-4/+8
| | | | | | | | | Fixes #13613.
| | * Add monthly active users documentation (#13617)Will Hunt2022-09-014-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add monthly active users documentation * changelog * Tidy up notes * more tidyup * Rewrite #1 * link back to mau docs * fix links * s/appservice|AS/application service * further review * a newline * Remove bit about shadow banned users. I think talking about them is confusing, and the current text doesn't imply they get any special treatment. * Update docs/usage/administration/monthly_active_users.md Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> * Update docs/usage/administration/monthly_active_users.md Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com> Co-authored-by: Brendan Abolivier <babolivier@matrix.org> Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
| | * Use poetry 1.2.0 rather than prerelease for deb packages (#13695)Erik Johnston2022-09-012-1/+7
| | |
| | * Add some logging to help track down #13444 (#13679)Erik Johnston2022-09-012-0/+14
| | |
| | * Return keys for unwhitelisted servers from `/_matrix/key/v2/query` (#13683)Richard van der Hoff2022-09-012-20/+22
| | |
| | * Bump docker image to use stable poetry version (#13688)Erik Johnston2022-09-013-11/+2
| | |
| | * Remove support for unstable private read receipts (#13653)Šimon Brandner2022-09-0113-122/+44
| | | | | | | | | Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
| | * Merge branch 'master' into developSean Quah2022-08-315-9/+47
| | |\
| | | * Tweak changelog formatting v1.66.0Sean Quah2022-08-311-6/+4
| | | |
| | | * Move notice from 1.66.0rc1 to 1.66.0 section in changelogSean Quah2022-08-311-6/+6
| | | |
| | | * Tweak changelog wordingSean Quah2022-08-311-4/+5
| | | |
| | | * Improve clarity on deprecation of TCP replicationSean Quah2022-08-312-2/+10
| | | | | | | | | | | | | | | | | | | | Borrows some text from https://github.com/matrix-org/synapse/pull/13647 for the changelog.
| | | * Fix dead link in 1.18.0 upgrade notesSean Quah2022-08-311-1/+1
| | | |
| | | * Update changelog to link to the Synapse docs instead of markdownSean Quah2022-08-311-1/+1
| | | |
| | | * 1.66.0Sean Quah2022-08-313-3/+12
| | | |
| | | * Update changelog for v1.62.0Sean Quah2022-08-311-0/+14
| | | |
| | | * Remind people that direct TCP replication is disabled. (#13674)Patrick Cloke2022-08-311-0/+8
| | | |
| | * | Drop support for calling `/_matrix/client/v3/rooms/{roomId}/invite` without ↵Jacek Kuśnierz2022-08-319-137/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | an `id_access_token` (#13241) Fixes #13206 Signed-off-by: Jacek Kusnierz jacek.kusnierz@tum.de
| | * | Remove cached wrap on `_get_joined_users_from_context` method (#13569)Nick Mills-Barrett2022-08-313-85/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The method doesn't actually do any data fetching and the method that does, `_get_joined_profile_from_event_id`, has its own cache. Signed off by Nick @ Beeper (@Fizzadar).
| | * | Generalise the `@cancellable` annotation so it can be used on functions ↵reivilibre2022-08-3110-75/+75
| | | | | | | | | | | | | | | | other than just servlet methods. (#13662)
| | * | Fix admin List Room API return type on sqlite (#13509)David Robertson2022-08-313-7/+19
| | | |
| | * | Change dpkg-statoverride to use --force-statoverride-add (#13638)Jörg Behrmann2022-08-312-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --force flag of dpkg-statoverride has been deprecated (apparently starting with the dpkg version in Debian buster). It offers --force-all as q quick fix, but the usage in the Debian postinst script is probably covered by --force-statoverride-add. Fixes: #8391 Signed-off-by: Jörg Behrmann <behrmann@physik.fu-berlin.de>
| | * | Give the correct next event when the message timestamps are the same - ↵Eric Eastwood2022-08-302-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSC3030 (#13658) Discovered while working on https://github.com/matrix-org/synapse/pull/13589 and I had all the messages at the same timestamp in the tests. Part of https://github.com/matrix-org/matrix-spec-proposals/pull/3030 Complement tests: https://github.com/matrix-org/complement/pull/457
| | * | Drop unused column `application_services_state.last_txn` (#13627)Shay2022-08-304-0/+59
| | | |
| | * | Remove documentation of legacy `frontend_proxy` worker app (#13645)Richard van der Hoff2022-08-303-41/+23
| | | | | | | | | | | | | | | | | | | | This has been the same as a generic_worker since #6964, so let's get rid of it. Fixes #3717
| | * | Merge branch 'release-v1.66' into developDavid Robertson2022-08-305-34/+144
| | |\|
| | | * Update changes v1.66.0rc2David Robertson2022-08-301-1/+1
| | | |
| | | * 1.66.0rc2David Robertson2022-08-304-2/+16
| | | |
| | | * Fix rate limit metrics registering twice and misreporting (#13649)Eric Eastwood2022-08-303-32/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix rate limit metrics registering twice and misreporting Fix https://github.com/matrix-org/synapse/issues/13641 * Fix lints * Add changelog * Document `metrics_name=None`.
| | * | Clarify documentation about replication traffic. (#13656)Patrick Cloke2022-08-302-1/+5
| | | | | | | | | | | | | | | | It can be authenticated with the worker_replication_secret setting, but is always unencrypted.
| | * | Fix bug where we wedge media plugins if clients disconnect early (#13660)Erik Johnston2022-08-302-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We incorrectly didn't use the returned `Responder` if the client had disconnected, which meant that the resource used by the Responder wasn't correctly released. In particular, this exhausted the thread pools so that *all* requests timed out.
| | * | Do not wait for background updates to complete do expire URL cache. (#13657)Patrick Cloke2022-08-302-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Media downloaded as part of a URL preview is normally deleted after two days. However, while a background database migration is running, the process is stopped. A long-running database migration can therefore cause the media store to fill up with old preview files. This logic was added in #2697 to make sure that we didn't try to run the expiry without an index on `local_media_repository.created_ts`; the original logic that needs that index was added in #2478 (in `get_url_cache_media_before`, as amended by 93247a424a5068b088567fa98b6990e47608b7cb), and is still present. Given that the background update was added before Synapse v1.0.0, just drop this check and assume the index exists.
| | * | Speed up inserting `event_push_actions_staging`. (#13634)Patrick Cloke2022-08-302-20/+9
| | | | | | | | | | | | By using `execute_values` instead of `execute_batch`.
| | * | Fix that user cannot `/forget` rooms after the last member has left (#13546)Dirk Klimpel2022-08-304-6/+99
| | | |
| | * | Optimize how we calculate `likely_domains` during backfill (#13575)Eric Eastwood2022-08-305-70/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize how we calculate `likely_domains` during backfill because I've seen this take 17s in production just to `get_current_state` which is used to `get_domains_from_state` (see case [*2. Loading tons of events* in the `/messages` investigation issue](https://github.com/matrix-org/synapse/issues/13356)). There are 3 ways we currently calculate hosts that are in the room: 1. `get_current_state` -> `get_domains_from_state` - Used in `backfill` to calculate `likely_domains` and `/timestamp_to_event` because it was cargo-culted from `backfill` - This one is being eliminated in favor of `get_current_hosts_in_room` in this PR 🕳 1. `get_current_hosts_in_room` - Used for other federation things like sending read receipts and typing indicators 1. `get_hosts_in_room_at_events` - Used when pushing out events over federation to other servers in the `_process_event_queue_loop` Fix https://github.com/matrix-org/synapse/issues/13626 Part of https://github.com/matrix-org/synapse/issues/13356 Mentioned in [internal doc](https://docs.google.com/document/d/1lvUoVfYUiy6UaHB6Rb4HicjaJAU40-APue9Q4vzuW3c/edit#bookmark=id.2tvwz3yhcafh) ### Query performance #### Before The query from `get_current_state` sucks just because we have to get all 80k events. And we see almost the exact same performance locally trying to get all of these events (16s vs 17s): ``` synapse=# SELECT type, state_key, event_id FROM current_state_events WHERE room_id = '!OGEhHVWSdvArJzumhm:matrix.org'; Time: 16035.612 ms (00:16.036) synapse=# SELECT type, state_key, event_id FROM current_state_events WHERE room_id = '!OGEhHVWSdvArJzumhm:matrix.org'; Time: 4243.237 ms (00:04.243) ``` But what about `get_current_hosts_in_room`: When there is 8M rows in the `current_state_events` table, the previous query in `get_current_hosts_in_room` took 13s from complete freshness (when the events were first added). But takes 930ms after a Postgres restart or 390ms if running back to back to back. ```sh $ psql synapse synapse=# \timing on synapse=# SELECT COUNT(DISTINCT substring(state_key FROM '@[^:]*:(.*)$')) FROM current_state_events WHERE type = 'm.room.member' AND membership = 'join' AND room_id = '!OGEhHVWSdvArJzumhm:matrix.org'; count ------- 4130 (1 row) Time: 13181.598 ms (00:13.182) synapse=# SELECT COUNT(*) from current_state_events where room_id = '!OGEhHVWSdvArJzumhm:matrix.org'; count ------- 80814 synapse=# SELECT COUNT(*) from current_state_events; count --------- 8162847 synapse=# SELECT pg_size_pretty( pg_total_relation_size('current_state_events') ); pg_size_pretty ---------------- 4702 MB ``` #### After I'm not sure how long it takes from complete freshness as I only really get that opportunity once (maybe restarting computer but that's cumbersome) and it's not really relevant to normal operating times. Maybe you get closer to the fresh times the more access variability there is so that Postgres caches aren't as exact. Update: The longest I've seen this run for is 6.4s and 4.5s after a computer restart. After a Postgres restart, it takes 330ms and running back to back takes 260ms. ```sh $ psql synapse synapse=# \timing on Timing is on. synapse=# SELECT substring(c.state_key FROM '@[^:]*:(.*)$') as host FROM current_state_events c /* Get the depth of the event from the events table */ INNER JOIN events AS e USING (event_id) WHERE c.type = 'm.room.member' AND c.membership = 'join' AND c.room_id = '!OGEhHVWSdvArJzumhm:matrix.org' GROUP BY host ORDER BY min(e.depth) ASC; Time: 333.800 ms ``` #### Going further To improve things further we could add a `limit` parameter to `get_current_hosts_in_room`. Realistically, we don't need 4k domains to choose from because there is no way we're going to query that many before we a) probably get an answer or b) we give up. Another thing we can do is optimize the query to use a index skip scan: - https://wiki.postgresql.org/wiki/Loose_indexscan - Index Skip Scan, https://commitfest.postgresql.org/37/1741/ - https://www.timescale.com/blog/how-we-made-distinct-queries-up-to-8000x-faster-on-postgresql/
| | * | Print complement failure results last (#13639)Richard van der Hoff2022-08-286-11/+31
| | | | | | | | | | | | | | | | | | | | Since github always scrolls to the bottom of any test output, let's put the failed tests last and hide any successful packages.
| | * | Improve documentation around user registration (#13640)Richard van der Hoff2022-08-264-103/+134
| | | | | | | | | | | | | | | | | | | | Update a bunch of the documentation for user registration, add some cross links, etc.
| | * | Generate missing configuration files at startup (#13615)Richard van der Hoff2022-08-263-12/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If things like the signing key file are missing, let's just try to generate them on startup. Again, this is useful for k8s-like deployments where we just want to generate keys on the first run.
| | * | Update debhelper (#13594)Jörg Behrmann2022-08-267-41/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update debian packaging to debhelper version 12 Don't call dh_installinit anymore, because it has been deprecated, and use dh_installsystemd instead of dh_systemd_enable for the same reason. Signed-off-by: Jörg Behrmann <behrmann@physik.fu-berlin.de> * Drop preinst script It was used for reasons of interactions of dh_systemd_start and dh_installinit, which have both be deprecated Signed-off-by: Jörg Behrmann <behrmann@physik.fu-berlin.de> * Drop /etc/default file It was no longer being installed. * Remove debian/compat file This is managed by the control file nowadays
| | * | Move the execution of the retention purge_jobs to the main worker (#13632)Brad Murray2022-08-262-4/+3
| | | | | | | | | | | | | | | | | | | | Fixes #9927 Signed-off-by: Brad Murray brad@beeper.com
| | * | Debian packaging: explicitly allocate a group for the system user (#13593)Jörg Behrmann2022-08-252-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the files of the synapse user are readable by the nobody user, which is unsafe. Signed-off-by: Jörg Behrmann <behrmann@physik.fu-berlin.de>
| | * | Support `registration_shared_secret` in a file (#13614)Richard van der Hoff2022-08-254-5/+92
| | | | | | | | | | | | | | | | A new `registration_shared_secret_path` option. This is kinda handy for k8s deployments and things.
| | * | register_new_matrix_user: read server url from config (#13616)Richard van der Hoff2022-08-252-6/+52
| | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/3672: `https://localhost:8448` is virtually never right.
| | * | Update automation for incoming issues (#13629)Kat Gerasimova2022-08-251-4/+4
| | | | | | | | | | | | GitHub appears to be deprecating addProjectNextItem by not allowing it to be used alongside projectV2 to get the project ID, so switching to using addProjectV2ItemById instead.
| | * | Comment about a better future where we can get the state diff between two ↵Eric Eastwood2022-08-242-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events (#13586) Split off from https://github.com/matrix-org/synapse/pull/13561 Part of https://github.com/matrix-org/synapse/issues/13356 Mentioned in [internal doc](https://docs.google.com/document/d/1lvUoVfYUiy6UaHB6Rb4HicjaJAU40-APue9Q4vzuW3c/edit#bookmark=id.2tvwz3yhcafh)
| | * | Rename `event_map` to `unpersisted_events` (#13603)David Robertson2022-08-242-32/+38
| | | |
| | * | Update `get_users_in_room` mis-use to get hosts with dedicated ↵Eric Eastwood2022-08-246-17/+31
| | | | | | | | | | | | | | | | | | | | `get_current_hosts_in_room` (#13605) See https://github.com/matrix-org/synapse/pull/13575#discussion_r953023755
| | * | Directly lookup local membership instead of getting all members in a room ↵Eric Eastwood2022-08-248-17/+60
| | | | | | | | | | | | | | | | | | | | first (`get_users_in_room` mis-use) (#13608) See https://github.com/matrix-org/synapse/pull/13575#discussion_r953023755
| | * | When loading current ids, sort by `stream_id` to avoid incorrect overwrite ↵Eric Eastwood2022-08-242-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and avoid errors caused by sorting alphabetical instance name which can be `null` (#13585) When loading current ids, sort by stream ID so that we don't want to overwrite the `current_position` of an instance to a lower stream ID than we're actually at ([discussion](https://github.com/matrix-org/synapse/pull/13585#discussion_r951795379)). Previously, it sorted alphabetically by instance name which can be `null` and throw errors but more importantly, accomplishes nothing. Fixes the following startup error which is why I started looking into this area: ``` $ poetry run synapse_homeserver --config-path homeserver.yaml **************************************************************** Error during initialisation: '<' not supported between instances of 'NoneType' and 'str' There may be more information in the logs. **************************************************************** ``` Somehow my database ended up looking like the following, notice the `instance_name` is `null` in the db, and we can't sort `NoneType` things. Another question is why do we see the `instance_name` as `null` sometimes instead of `master` in monolith mode? ``` $ psql synapse synapse=# SELECT * FROM stream_positions; stream_name | instance_name | stream_id -----------------+---------------+----------- account_data | master | 1242 events | master | 1787 to_device | master | 58 presence_stream | master | 485638 receipts | master | 341 backfill | master | -139106 (6 rows) synapse=# SELECT instance_name, stream_id FROM receipts_linearized; instance_name | stream_id ---------------+----------- | 211 | 3 | 4 | 212 | 213 | 224 | 228 | 164 | 313 | 253 | 38 | 321 | 324 | 189 | 192 | 193 | 194 | 195 | 197 | 198 | 275 | 79 | 339 | 340 | 82 | 341 | 84 | 85 | 91 | 119 ```
| | * | Use dedicated `get_local_users_in_room` to find local users when calculating ↵Eric Eastwood2022-08-242-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `join_authorised_via_users_server` of a `/make_join` request (#13606) Use dedicated `get_local_users_in_room` to find local users when calculating `join_authorised_via_users_server` ("the authorising user for joining a restricted room") of a `/make_join` request. Found while working on https://github.com/matrix-org/synapse/pull/13575#discussion_r953023755 but it's not related.
| | * | First draft of triage_labelled action (#13612)Andy Balaam2022-08-241-0/+44
| | | |
| | * | Add experimental configuration option to allow disabling legacy Prometheus ↵reivilibre2022-08-249-21/+150
| | | | | | | | | | | | | | | | | | | | metric names. (#13540) Co-authored-by: David Robertson <davidr@element.io>
| | * | Add GitHub automation for new issues (#13610)Kat Gerasimova2022-08-241-0/+28
| | | | | | | | | | | | Set up automation to move newly opened issues in GitHub to the issue triage board.
| | * | Rewrite get push actions queries (#13597)Nick Mills-Barrett2022-08-242-160/+69
| | | |
| | * | Faster Room Joins: fix `/make_knock` blocking indefinitely when the room in ↵reivilibre2022-08-242-0/+12
| | | | | | | | | | | | | | | | | | | | question is a partial-stated room. (#13583) Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>
| | * | Instrument `_check_sigs_and_hash_and_fetch` to trace time spent in child ↵Eric Eastwood2022-08-235-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concurrent calls (#13588) Instrument `_check_sigs_and_hash_and_fetch` to trace time spent in child concurrent calls because I've see `_check_sigs_and_hash_and_fetch` take [10.41s to process 100 events](https://github.com/matrix-org/synapse/issues/13587) Fix https://github.com/matrix-org/synapse/issues/13587 Part of https://github.com/matrix-org/synapse/issues/13356
| | * | Write about the chain cover a little. (#13602)David Robertson2022-08-232-9/+43
| | | | | | | | | | | | Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>
| | * | Speed up `@cachedList` (#13591)Erik Johnston2022-08-234-141/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This speeds things up by ~2x. The vast majority of the time is now spent in `LruCache` moving things around the linked lists. We do this via two things: 1. Don't create a deferred per-key during bulk set operations in `DeferredCache`. Instead, only create them if a subsequent caller asks for the key. 2. Add a bulk lookup API to `DeferredCache` rather than use a loop.
| | * | Fix regression caused by #13573 (#13600)Erik Johnston2022-08-232-4/+7
| | | | | | | | | | | | Broke in #13573.
| | * | Update openid.md (#13568)nilsKr32022-08-231-1/+3
| | | | | | | | | | | | Linking the help article may prevent confusion regarding the creation of the necessary rule using auth0.
| | * | Merge tag 'v1.66.0rc1' into developDavid Robertson2022-08-2359-291/+185
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.66.0rc1 (2022-08-23) ============================== This release removes the ability for homeservers to delegate email ownership verification and password reset confirmation to identity servers. This removal was originally planned for Synapse 1.64, but was later deferred until now. See the [upgrade notes](https://matrix-org.github.io/synapse/v1.66/upgrade.html#upgrading-to-v1660) for more details. Features -------- - Improve validation of request bodies for the following client-server API endpoints: [`/account/password`](https://spec.matrix.org/v1.3/client-server-api/#post_matrixclientv3accountpassword), [`/account/password/email/requestToken`](https://spec.matrix.org/v1.3/client-server-api/#post_matrixclientv3accountpasswordemailrequesttoken), [`/account/deactivate`](https://spec.matrix.org/v1.3/client-server-api/#post_matrixclientv3accountdeactivate) and [`/account/3pid/email/requestToken`](https://spec.matrix.org/v1.3/client-server-api/#post_matrixclientv3account3pidemailrequesttoken). ([\#13188](https://github.com/matrix-org/synapse/issues/13188), [\#13563](https://github.com/matrix-org/synapse/issues/13563)) - Add forgotten status to [Room Details Admin API](https://matrix-org.github.io/synapse/latest/admin_api/rooms.html#room-details-api). ([\#13503](https://github.com/matrix-org/synapse/issues/13503)) - Add an experimental implementation for [MSC3852 (Expose user agents on `Device`)](https://github.com/matrix-org/matrix-spec-proposals/pull/3852). ([\#13549](https://github.com/matrix-org/synapse/issues/13549)) - Add `org.matrix.msc2716v4` experimental room version with updated content fields. Part of [MSC2716 (Importing history)](https://github.com/matrix-org/matrix-spec-proposals/pull/2716). ([\#13551](https://github.com/matrix-org/synapse/issues/13551)) - Add support for compression to federation responses. ([\#13537](https://github.com/matrix-org/synapse/issues/13537)) - Improve performance of sending messages in rooms with thousands of local users. ([\#13522](https://github.com/matrix-org/synapse/issues/13522), [\#13547](https://github.com/matrix-org/synapse/issues/13547)) Bugfixes -------- - Faster room joins: make `/joined_members` block whilst the room is partial stated. ([\#13514](https://github.com/matrix-org/synapse/issues/13514)) - Fix a bug introduced in Synapse 1.21.0 where the [`/event_reports` Admin API](https://matrix-org.github.io/synapse/develop/admin_api/event_reports.html) could return a total count which was larger than the number of results you can actually query for. ([\#13525](https://github.com/matrix-org/synapse/issues/13525)) - Fix a bug introduced in Synapse 1.52.0 where sending server notices fails if `max_avatar_size` or `allowed_avatar_mimetypes` is set and not `system_mxid_avatar_url`. ([\#13566](https://github.com/matrix-org/synapse/issues/13566)) - Fix a bug where the `opentracing.force_tracing_for_users` config option would not apply to [`/sendToDevice`](https://spec.matrix.org/v1.3/client-server-api/#put_matrixclientv3sendtodeviceeventtypetxnid) and [`/keys/upload`](https://spec.matrix.org/v1.3/client-server-api/#post_matrixclientv3keysupload) requests. ([\#13574](https://github.com/matrix-org/synapse/issues/13574)) Improved Documentation ---------------------- - Add `openssl` example for generating registration HMAC digest. ([\#13472](https://github.com/matrix-org/synapse/issues/13472)) - Tidy up Synapse's README. ([\#13491](https://github.com/matrix-org/synapse/issues/13491)) - Document that event purging related to the `redaction_retention_period` config option is executed only every 5 minutes. ([\#13492](https://github.com/matrix-org/synapse/issues/13492)) - Add a warning to retention documentation regarding the possibility of database corruption. ([\#13497](https://github.com/matrix-org/synapse/issues/13497)) - Document that the `DOCKER_BUILDKIT=1` flag is needed to build the docker image. ([\#13515](https://github.com/matrix-org/synapse/issues/13515)) - Add missing links in `user_consent` section of configuration manual. ([\#13536](https://github.com/matrix-org/synapse/issues/13536)) - Fix the doc and some warnings that were referring to the nonexistent `custom_templates_directory` setting (instead of `custom_template_directory`). ([\#13538](https://github.com/matrix-org/synapse/issues/13538)) Deprecations and Removals ------------------------- - Remove the ability for homeservers to delegate email ownership verification and password reset confirmation to identity servers. See [upgrade notes](https://matrix-org.github.io/synapse/v1.66/upgrade.html#upgrading-to-v1660) for more details. Internal Changes ---------------- - Update the rejected state of events during de-partial-stating. ([\#13459](https://github.com/matrix-org/synapse/issues/13459)) - Avoid blocking lazy-loading `/sync`s during partial joins due to remote memberships. Pull remote memberships from auth events instead of the room state. ([\#13477](https://github.com/matrix-org/synapse/issues/13477)) - Refuse to start when faster joins is enabled on a deployment with workers, since worker configurations are not currently supported. ([\#13531](https://github.com/matrix-org/synapse/issues/13531)) - Allow use of both `@trace` and `@tag_args` stacked on the same function. ([\#13453](https://github.com/matrix-org/synapse/issues/13453)) - Instrument the federation/backfill part of `/messages` for understandable traces in Jaeger. ([\#13489](https://github.com/matrix-org/synapse/issues/13489)) - Instrument `FederationStateIdsServlet` (`/state_ids`) for understandable traces in Jaeger. ([\#13499](https://github.com/matrix-org/synapse/issues/13499), [\#13554](https://github.com/matrix-org/synapse/issues/13554)) - Track HTTP response times over 10 seconds from `/messages` (`synapse_room_message_list_rest_servlet_response_time_seconds`). ([\#13533](https://github.com/matrix-org/synapse/issues/13533)) - Add metrics to track how the rate limiter is affecting requests (sleep/reject). ([\#13534](https://github.com/matrix-org/synapse/issues/13534), [\#13541](https://github.com/matrix-org/synapse/issues/13541)) - Add metrics to time how long it takes us to do backfill processing (`synapse_federation_backfill_processing_before_time_seconds`, `synapse_federation_backfill_processing_after_time_seconds`). ([\#13535](https://github.com/matrix-org/synapse/issues/13535), [\#13584](https://github.com/matrix-org/synapse/issues/13584)) - Add metrics to track rate limiter queue timing (`synapse_rate_limit_queue_wait_time_seconds`). ([\#13544](https://github.com/matrix-org/synapse/issues/13544)) - Update metrics to track `/messages` response time by room size. ([\#13545](https://github.com/matrix-org/synapse/issues/13545)) - Refactor methods in `synapse.api.auth.Auth` to use `Requester` objects everywhere instead of user IDs. ([\#13024](https://github.com/matrix-org/synapse/issues/13024)) - Clean-up tests for notifications. ([\#13471](https://github.com/matrix-org/synapse/issues/13471)) - Add some miscellaneous comments to document sync, especially around `compute_state_delta`. ([\#13474](https://github.com/matrix-org/synapse/issues/13474)) - Use literals in place of `HTTPStatus` constants in tests. ([\#13479](https://github.com/matrix-org/synapse/issues/13479), [\#13488](https://github.com/matrix-org/synapse/issues/13488)) - Add comments about how event push actions are rotated. ([\#13485](https://github.com/matrix-org/synapse/issues/13485)) - Modify HTML template content to better support mobile devices' screen sizes. ([\#13493](https://github.com/matrix-org/synapse/issues/13493)) - Add a linter script which will reject non-strict types in Pydantic models. ([\#13502](https://github.com/matrix-org/synapse/issues/13502)) - Reduce the number of tests using legacy TCP replication. ([\#13543](https://github.com/matrix-org/synapse/issues/13543)) - Allow specifying additional request fields when using the `HomeServerTestCase.login` helper method. ([\#13549](https://github.com/matrix-org/synapse/issues/13549)) - Make `HomeServerTestCase` load any configured homeserver modules automatically. ([\#13558](https://github.com/matrix-org/synapse/issues/13558))
| | | * Remove manually-added changelog v1.66.0rc1David Robertson2022-08-231-1/+0
| | | |
| | | * Drop support for delegating email validation, round 2 (#13596)David Robertson2022-08-2313-245/+108
| | | |
| | | * Update changelogDavid Robertson2022-08-231-5/+5
| | | |
| | | * Adjust changelogDavid Robertson2022-08-231-18/+26
| | | |
| | | * Describe changes to admin API in 1.66David Robertson2022-08-231-0/+2
| | | | | | | | | | | | | | | | Cross-ref #13525
| | | * 1.66.0rc1David Robertson2022-08-2347-46/+68
| | | |
| | * | Speed up fetching large numbers of push rules (#13592)Erik Johnston2022-08-234-9/+2
| | | |