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

Run the background worker during worker mode. #958

Merged
merged 6 commits into from
Oct 6, 2020
Merged

Run the background worker during worker mode. #958

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c71f6a4
Run the background worker during worker mode.
clokep Sep 22, 2020
a300192
Properly configure replication for the additional worker.
clokep Sep 22, 2020
6ce81f2
Run the background worker as a generic worker.
clokep Sep 29, 2020
ab3ebf4
Properly configure monoliths.
clokep Sep 29, 2020
5a5bd64
Merge remote-tracking branch 'origin/develop' into clokep/background-…
clokep Oct 6, 2020
05bdeb9
Don't try to write the yaml file.
clokep Oct 6, 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
18 changes: 17 additions & 1 deletion lib/SyTest/Homeserver/Synapse.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ sub start
send_federation => ( not $self->{workers} ),
update_user_directory => ( not $self->{workers} ),
enable_media_repo => ( not $self->{workers} ),
run_background_tasks_on => ( $self->{workers} ? "background_worker1" : "master" ),

url_preview_enabled => "true",
url_preview_ip_range_blacklist => [],
Expand Down Expand Up @@ -324,7 +325,7 @@ sub start
{
# create or truncate
open my $tmph, ">", $log or die "Cannot open $log for writing - $!";
foreach my $suffix ( qw( appservice media_repository federation_reader synchrotron federation_sender client_reader user_dir event_creator frontend_proxy ) ) {
foreach my $suffix ( qw( appservice media_repository federation_reader synchrotron federation_sender client_reader user_dir event_creator frontend_proxy background_worker ) ) {
open my $tmph, ">", "$log.$suffix" or die "Cannot open $log.$suffix for writing - $!";
}
}
Expand Down Expand Up @@ -954,6 +955,21 @@ sub _start_synapse
push @worker_configs, $frontend_proxy_config;
}

{
my $background_worker_config = {
"worker_app" => "synapse.app.generic_worker",
"worker_name" => "background_worker1",
"worker_pid_file" => "$hsdir/background_worker.pid",
"worker_log_config" => $self->configure_logger("background_worker"),
"worker_replication_host" => "$bind_host",
"worker_replication_http_port" => $self->{ports}{synapse_unsecure},
"worker_replication_port" => $self->{ports}{synapse_replication_tcp},
"worker_main_http_uri" => "http://$bind_host:$self->{ports}{synapse_unsecure}",
};

push @worker_configs, $background_worker_config;
}

my @base_synapse_command = $self->_generate_base_synapse_command();
my $idx = $self->{hs_index};

Expand Down