Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] develop from matrix-org:develop #319

Open
wants to merge 370 commits into
base: develop
Choose a base branch
from

Conversation

pull[bot]
Copy link

@pull pull bot commented Sep 24, 2020

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Sep 24, 2020
@pull pull bot added the merge-conflict Resolve conflicts manually label Nov 27, 2020
richvdh and others added 28 commits August 26, 2021 10:55
Servers should not be *obliged* to send a `state_ids` request if it already has
the `auth_events` of a given event.
Suggest we leave Buildkite running in parallel for the time being. In particular we want to ensure that the cross-branch synapse-sytest and dendrite-sytest stuff works.

Co-authored-by: Andrew Morgan <[email protected]>
In #1115 I didn't correctly handle the situation where there's a corresponding synapse/dendrite branch to fetch. #1128 fell victim to this.

Fix: reuse the shell script from matrix-org/synapse#10160, i.e. consult a wider range of GHA's environment variables.

Co-authored-by: Andrew Morgan <[email protected]>
I guess we never noticed this because no-one build and deployed the
sytest containers?
Join the room synchronously. Add extra syncs elsewhere, to try and
ensure that the device_list_updates have propagated to all workers.
is down`"

This seemed to work when using workers, but failed consistently when
not using workers.

This reverts commit d70e06a.
Configure push server database for dendrite
Add support for a presence db in Dendrite
…wn` (#1142)

* Attempt to deflake `Device list doesn't change if remote server is down`

Hopefully closes #1136

Co-authored-by: Erik Johnston <[email protected]>
* Deflake `Old leaves are present in gapped incremental syncs`

Hopefully, deflake this, by making sure that all of Bob's events hit the
synchrotron before trying to sync from Alice.

Fixes #1037

* Deflake `Gapped incremental syncs include all state changes`

Give this one the same treatment.

Fixes #1043.

* Deflake `Leaves are present in non-gapped incremental syncs`

Another case of the same.

Fixes #1045

* Update `The only membership state in initial sync`...

This is non-functional, just a cleanup:

 * use `send_filler_messags_synced` instead of a loop
 * use `check_filler_event` instead of a local definition
 * fix a warning `Use of uninitialized value in numeric eq (==)`
 * use `die` instead of `croak`, given we want to log the right line number.

* Use `matrix_send_filler_messages_synced` elsewhere

... for consistency, and because it's shorter.
We have some tests in tests/50federation/52soft-fail.pl which test soft-failing, but which have never been updated to work with room versions other than v1.

For the most part, this is just a matter of updating them to use utility functions instead of making assumptions about the shapes of the events, but it turns out that there is another wrinkle, which is that they were making some assumptions about the state-resolution algorithm which are not true in subsequent room versions.
Also move `matrix_forget_room` to top of file
Half-Shot and others added 30 commits August 9, 2023 10:14
As the comment says, this test was looking for the wrong thing, and actually
enforcing buggy behaviour.
This will fix prebuilding of dependencies.
BBind to 127.0.0.1 when using docker

I'm not sure why this is a problem, but emprically it is now required
for me to run it locally.

The exact thing that needs to change is that HaProxy server addresses
need to be changed. I assume its something like when HaProxy starts
`localhost` can't be resolved.
* Update test for MSC3967

* Remove redundant UIA for cross-signing-key upload

MSC3967 says this is no longer needed.
Co-authored-by: Andrew Morgan <[email protected]>
)

* Stop using 'database' and start using 'dbname' to describe the database name to connect to in Postgres

For Synapse, these pass through and match expected configuration expectations from the manual.

For Dendrite, the generated database config is parsed and turned into a DSN that is used to
generate its main config yaml. All that was needed is to update where the value comes from.

This brings the named parameters into line with libpq.

* Stop removing and re-adding the `name` attribute from the database config

This only seemed to be needed for Synapse as Dendrite used another method and was not relevant
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.