diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-03-15 23:14:12 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-03-15 23:14:12 +0100 |
| commit | 6a8439fd1345ecae7414386f76dda7a03eb14df2 (patch) | |
| tree | a6306030d7f0cc41158512e600683b8874f7d85e /src/table | |
| parent | 0cd5b2ae19965b8c1f3176afeb8f678c4d8366dd (diff) | |
| download | garage-6a8439fd1345ecae7414386f76dda7a03eb14df2.tar.gz garage-6a8439fd1345ecae7414386f76dda7a03eb14df2.zip | |
Some improvements in background worker but we terminate late
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/merkle.rs | 5 | ||||
| -rw-r--r-- | src/table/sync.rs | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/table/merkle.rs b/src/table/merkle.rs index 86289bf1..60b7833f 100644 --- a/src/table/merkle.rs +++ b/src/table/merkle.rs @@ -101,10 +101,7 @@ impl MerkleUpdater { ret } - async fn updater_loop( - self: Arc<Self>, - mut must_exit: watch::Receiver<bool>, - ) { + async fn updater_loop(self: Arc<Self>, mut must_exit: watch::Receiver<bool>) { while !*must_exit.borrow() { if let Some(x) = self.todo.iter().next() { match x { diff --git a/src/table/sync.rs b/src/table/sync.rs index 65231cd5..f8fef53c 100644 --- a/src/table/sync.rs +++ b/src/table/sync.rs @@ -3,7 +3,7 @@ use std::convert::TryInto; use std::sync::{Arc, Mutex}; use std::time::{Duration, Instant}; -use futures::{select}; +use futures::select; use futures_util::future::*; use futures_util::stream::*; use rand::Rng; |