diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-10-15 11:05:09 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-10-22 16:55:24 +0200 |
| commit | 1b450c4b493dfcb2ee88acbca3ea584beac8eb4b (patch) | |
| tree | d6437f105a630fa197b67446b5c3b2902335c34a /src/garage/server.rs | |
| parent | 4067797d0142ee7860aff8da95d65820d6cc0889 (diff) | |
| download | garage-1b450c4b493dfcb2ee88acbca3ea584beac8eb4b.tar.gz garage-1b450c4b493dfcb2ee88acbca3ea584beac8eb4b.zip | |
Improvements to CLI and various fixes for netapp version
Discovery via consul, persist peer list to file
Diffstat (limited to 'src/garage/server.rs')
| -rw-r--r-- | src/garage/server.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs index 0edf3e2d..cd92d157 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -71,8 +71,14 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> { // Remove RPC handlers for system to break reference cycles garage.system.netapp.drop_all_handlers(); - // Await for last parts to end + // Await for netapp RPC system to end run_system.await?; + + // Break last reference cycles so that stuff can terminate properly + garage.break_reference_cycles(); + drop(garage); + + // Await for all background tasks to end await_background_done.await?; info!("Cleaning up..."); |