diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-01-04 11:34:43 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-01-04 11:34:43 +0100 |
| commit | 570e5e5bbb7a3eac41350db9433e28ed289b97f4 (patch) | |
| tree | a7fc299ba180098be5a3bef28a39256870ce697b /src/garage/server.rs | |
| parent | 6e44369cbc810b8912ca0f7f5fd293e87f10c851 (diff) | |
| parent | 4eb8ca3a528dae2848141f5cc3eb607eb7d40114 (diff) | |
| download | garage-570e5e5bbb7a3eac41350db9433e28ed289b97f4.tar.gz garage-570e5e5bbb7a3eac41350db9433e28ed289b97f4.zip | |
Merge branch 'main' into next
Diffstat (limited to 'src/garage/server.rs')
| -rw-r--r-- | src/garage/server.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs index d4099a97..16f1b625 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -35,12 +35,15 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> { #[cfg(feature = "metrics")] let metrics_exporter = opentelemetry_prometheus::exporter().init(); + info!("Initializing Garage main data store..."); + let garage = Garage::new(config.clone())?; + info!("Initializing background runner..."); let watch_cancel = watch_shutdown_signal(); - let (background, await_background_done) = BackgroundRunner::new(16, watch_cancel.clone()); + let (background, await_background_done) = BackgroundRunner::new(watch_cancel.clone()); - info!("Initializing Garage main data store..."); - let garage = Garage::new(config.clone(), background)?; + info!("Spawning Garage workers..."); + garage.spawn_workers(&background); if config.admin.trace_sink.is_some() { info!("Initialize tracing..."); @@ -63,7 +66,7 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> { let run_system = tokio::spawn(garage.system.clone().run(watch_cancel.clone())); info!("Create admin RPC handler..."); - AdminRpcHandler::new(garage.clone()); + AdminRpcHandler::new(garage.clone(), background.clone()); // ---- Launch public-facing API servers ---- |