* 'develop' of github.com:matrix-org/synapse: (76 commits)
1.12.4
Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_token""
Revert "Merge pull request #7315 from matrix-org/babolivier/request_token"
Stop the master relaying USER_SYNC for other workers (#7318)
Config option to inhibit 3PID errors on /requestToken
Fix replication metrics when using redis (#7325)
formatting for the changelog
Another go at fixing one-word commands (#7326)
1.12.4rc1
1.12.4rc1
fix changelog name
Extend StreamChangeCache to support multiple entities per stream ID (#7303)
Extend room admin api with additional attributes (#7225)
Add ability to run replication protocol over redis. (#7040)
Do not treat display names as globs for push rules. (#7271)
Reduce logging verbosity of URL cache cleanup. (#7295)
Query missing cross-signing keys on local sig upload (#7289)
import urllib.parse when using urllib.parse.quote (#7319)
Reduce federation logging on success (#7321)
Fix changelog file
...
First some background: StreamChangeCache is used to keep track of what "entities" have
changed since a given stream ID. So for example, we might use it to keep track of when the last
to-device message for a given user was received [1], and hence whether we need to pull any to-device messages from the database on a sync [2].
Now, it turns out that StreamChangeCache didn't support more than one thing being changed at
a given stream_id (this was part of the problem with #7206). However, it's entirely valid to send
to-device messages to more than one user at a time.
As it turns out, this did in fact work, because *some* methods of StreamChangeCache coped
ok with having multiple things changing on the same stream ID, and it seems we never actually
use the methods which don't work on the stream change caches where we allow multiple
changes at the same stream ID. But that feels horribly fragile, hence: let's update
StreamChangeCache to properly support this, and add some typing and some more tests while
we're at it.
[1]: https://github.com/matrix-org/synapse/blob/release-v1.12.3/synapse/storage/data_stores/main/deviceinbox.py#L301
[2]: https://github.com/matrix-org/synapse/blob/release-v1.12.3/synapse/storage/data_stores/main/deviceinbox.py#L47-L51
Andrew Morgan