diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-03-11 13:47:21 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-03-11 13:47:21 +0100 |
| commit | 8d63738cb062e816fc01c6aa2b32936ad31ff65b (patch) | |
| tree | d69bb200a86788e2d7cde822afb70d54f7e7f448 /src/garage | |
| parent | 3214dd52dd144c99353830d7340ea158e262b06f (diff) | |
| download | garage-8d63738cb062e816fc01c6aa2b32936ad31ff65b.tar.gz garage-8d63738cb062e816fc01c6aa2b32936ad31ff65b.zip | |
Checkpoint: add merkle tree in data table
Diffstat (limited to 'src/garage')
| -rw-r--r-- | src/garage/admin_rpc.rs | 3 | ||||
| -rw-r--r-- | src/garage/server.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/garage/admin_rpc.rs b/src/garage/admin_rpc.rs index e1981e3a..b4a65cad 100644 --- a/src/garage/admin_rpc.rs +++ b/src/garage/admin_rpc.rs @@ -350,8 +350,7 @@ impl AdminRpcHandler { .background .spawn_worker("Repair worker".into(), move |must_exit| async move { repair.repair_worker(opt, must_exit).await - }) - .await; + }); Ok(AdminRPC::Ok(format!( "Repair launched on {:?}", self.garage.system.id diff --git a/src/garage/server.rs b/src/garage/server.rs index a0ab17c4..8dddd7bb 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -49,7 +49,7 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> { let (send_cancel, watch_cancel) = watch::channel(false); let background = BackgroundRunner::new(16, watch_cancel.clone()); - let garage = Garage::new(config, db, background.clone(), &mut rpc_server).await; + let garage = Garage::new(config, db, background.clone(), &mut rpc_server); info!("Crate admin RPC handler..."); AdminRpcHandler::new(garage.clone()).register_handler(&mut rpc_server); |