From 0837b3dacd994b35dbccbfefdd68be044eb4b5ac Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 24 Jun 2022 10:49:52 +0200
Subject: Slightly improve blocking code, add info to resync worker

---
 src/table/merkle.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/table')

diff --git a/src/table/merkle.rs b/src/table/merkle.rs
index 4c84933a..21186220 100644
--- a/src/table/merkle.rs
+++ b/src/table/merkle.rs
@@ -326,7 +326,18 @@ where
 		&mut self,
 		_must_exit: &mut watch::Receiver<bool>,
 	) -> Result<WorkerStatus, Error> {
-		self.0.updater_loop_iter()
+		let updater = self.0.clone();
+		tokio::task::spawn_blocking(move || {
+			for _i in 0..100 {
+				let s = updater.updater_loop_iter();
+				if !matches!(s, Ok(WorkerStatus::Busy)) {
+					return s;
+				}
+			}
+			Ok(WorkerStatus::Busy)
+		})
+		.await
+		.unwrap()
 	}
 
 	async fn wait_for_work(&mut self, must_exit: &watch::Receiver<bool>) -> WorkerStatus {
-- 
cgit v1.2.3