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.

Sign up for GitHub

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

Have frontend proxy persist events when using redis #870

Merged
merged 11 commits into from
Jun 2, 2020
+155 −109
Merged

Have frontend proxy persist events when using redis #870

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b6e2ccc
Have frontend proxy persit events when using redis
erikjohnston May 15, 2020
97e9a2d
Use renamed variable
erikjohnston May 18, 2020
ed33ee2
Merge branch 'develop' of github.com:matrix-org/sytest into erikj/mov…
erikjohnston May 18, 2020
705d037
Fiddle some timeouts
erikjohnston May 18, 2020
1c0844d
Remove password
erikjohnston May 19, 2020
80c993d
Add some retry_until_success to fix some races
erikjohnston May 21, 2020
67916d5
Always sync power level changes
erikjohnston May 21, 2020
b249839
More flakey test fixes
erikjohnston May 22, 2020
32d06f9
Flakey test
erikjohnston May 22, 2020
70f6ca5
Flakey test
erikjohnston May 22, 2020
95045ff
More flakey test fixes
erikjohnston May 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions lib/SyTest/Homeserver/Synapse.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,27 @@ sub start
},
) : (),

instance_map => {
"frontend_proxy1" => {
host => "$bind_host",
port => $self->{ports}{frontend_proxy},
},
},

stream_writers => {
events => $self->{redis_host} ne '' ? "frontend_proxy1" : "master",
},

# We use a high limit so the limit is never reached, but enabling the
# limit ensures that the code paths get hit. This helps testing the
# feature with worker mode.
limit_usage_by_mau => "true",
max_mau_value => 50000000,

redis => {
enabled => $self->{redis_host} ne '',
host => $self->{redis_host},
enabled => $self->{redis_host} ne '',
password => "foobar",
host => $self->{redis_host},
},

map {
Expand Down Expand Up @@ -988,6 +1000,7 @@ sub wrap_synapse_command
{
my $frontend_proxy_config_path = $self->write_yaml_file( "frontend_proxy.yaml" => {
"worker_app" => "synapse.app.frontend_proxy",
"worker_name" => "frontend_proxy1",
"worker_pid_file" => "$hsdir/frontend_proxy.pid",
"worker_log_config" => $self->configure_logger("frontend_proxy"),
"worker_replication_host" => "$bind_host",
Expand All @@ -997,7 +1010,7 @@ sub wrap_synapse_command
"worker_listeners" => [
{
type => "http",
resources => [{ names => ["client"] }],
resources => [{ names => ["client", "replication"] }],
port => $self->{ports}{frontend_proxy},
bind_address => $bind_host,
},
Expand Down