From 7b7dcb5a77061cb69d368de263a02b5ad26fbf51 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 26 Oct 2026 04:20:52 +0100 Subject: unify lock logic --- src/remake/local.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/remake/local.rs') diff --git a/src/remake/local.rs b/src/remake/local.rs index 517367b..8e9d8ba 100644 --- a/src/remake/local.rs +++ b/src/remake/local.rs @@ -16,6 +16,7 @@ use tokio::time::Instant; use super::records::Retention; use super::snapshot::Snapshot; use crate::document::replica::Epoch; +use crate::locks::MutexExt; pub(crate) struct RemakeState { /// When this node started (Unix milliseconds): votes it cast before may be lost @@ -185,9 +186,7 @@ impl RemakeState { } fn lock(&self) -> MutexGuard<'_, Inner> { - self.inner - .lock() - .unwrap_or_else(|poisoned| poisoned.into_inner()) + self.inner.lock_or_recover() } pub(crate) fn store_prebuilt(&self, id: &str, snapshot: Snapshot) { -- cgit v1.3.1