diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-12-14 12:51:16 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-12-14 12:51:42 +0100 |
| commit | d56c472712df7c064387429a5af73d3bc0eb438d (patch) | |
| tree | d3d73490ae3167a228ee91f69a583242c572cd9f /src/garage/server.rs | |
| parent | 2183518edccadef47cdeaf6476033b52d8832d6e (diff) | |
| download | garage-d56c472712df7c064387429a5af73d3bc0eb438d.tar.gz garage-d56c472712df7c064387429a5af73d3bc0eb438d.zip | |
Refactor background runner and get rid of job worker
Diffstat (limited to 'src/garage/server.rs')
| -rw-r--r-- | src/garage/server.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs index 8e29f6ec..16f1b625 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -35,15 +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()); - - info!("Initializing Garage main data store..."); - let garage = Garage::new(config.clone(), background)?; + let (background, await_background_done) = BackgroundRunner::new(watch_cancel.clone()); info!("Spawning Garage workers..."); - garage.spawn_workers(); + garage.spawn_workers(&background); if config.admin.trace_sink.is_some() { info!("Initialize tracing..."); @@ -66,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 ---- |