Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

vecdb: release the writer lock before slot teardown and grant a bounded acquire grace

laurensprieme058a0e689a3
diff --git a/rust/crates/ml/src/vecdb/lock.rs b/rust/crates/ml/src/vecdb/lock.rs
index 2cba195605..5efb627c8b 100644
--- a/rust/crates/ml/src/vecdb/lock.rs
+++ b/rust/crates/ml/src/vecdb/lock.rs
@@ -1,9 +1,12 @@
use std::fs::{File, TryLockError};
use std::path::{Path, PathBuf};
+use std::time::Duration;
use super::VecDbError;
const ACQUIRE_ATTEMPTS: usize = 8;
+const CONTENTION_GRACE_STEPS: usize = 50;
+const CONTENTION_GRACE_STEP: Duration = Duration::from_millis(1);
#[derive(Debug)]
pub(crate) struct WriterLock {
@@ -12,18 +15,30 @@ pub(crate) struct WriterLock {
impl WriterLock {
pub(crate) fn acquire(log_path: &Path) -> Result<Self, VecDbError> {
+ let mut remaining_grace = CONTENTION_GRACE_STEPS;
+ loop {
+ if let Some(lock) = Self::acquire_once(log_path)? {
+ return Ok(lock);
+ }
+ if remaining_grace == 0 {
+ return Err(VecDbError::Locked(log_path.to_path_buf()));
+ }
+ remaining_grace -= 1;
+ std::thread::sleep(CONTENTION_GRACE_STEP);
+ }
+ }
+
+ fn acquire_once(log_path: &Path) -> Result<Option<Self>, VecDbError> {
let sidecar = lock_path(log_path);
for _ in 0..ACQUIRE_ATTEMPTS {
let file = open_sidecar(&sidecar)?;
match file.try_lock() {
Ok(()) => {
if lock_is_on_the_linked_sidecar(&file, &sidecar)? {
- return Ok(Self { _file: file });
+ return Ok(Some(Self { _file: file }));
}
}
- Err(TryLockError::WouldBlock) => {
- return Err(VecDbError::Locked(log_path.to_path_buf()));
- }
+ Err(TryLockError::WouldBlock) => return Ok(None),
Err(TryLockError::Error(source)) => return Err(VecDbError::io(&sidecar, source)),
}
}
diff --git a/rust/crates/ml/src/vecdb/store.rs b/rust/crates/ml/src/vecdb/store.rs
index 60c0c15691..24430877b7 100644
--- a/rust/crates/ml/src/vecdb/store.rs
+++ b/rust/crates/ml/src/vecdb/store.rs
@@ -185,6 +185,11 @@ impl Shared {
impl Drop for Shared {
fn drop(&mut self) {
+ let half = self
+ .writer
+ .get_mut()
+ .unwrap_or_else(PoisonError::into_inner);
+ half.mode = WriterMode::ReadOnly { log_bytes: 0 };
let Some(key) = &self.registry_key else {
return;
};
@@ -2192,6 +2197,36 @@ mod tests {
assert!(Arc::ptr_eq(&reopened.shared, &again.shared));
}
+ #[test]
+ fn racing_open_and_drop_churn_never_reports_locked() {
+ const CYCLES: usize = 300;
+ let dir = TempDir::new().unwrap();
+ let path = dir.path().join("db");
+ open_writer(&path)
+ .add("seed", &seeded_unit_vector(1, DIMS))
+ .unwrap();
+ let barrier = Arc::new(Barrier::new(2));
+ let churners: Vec<_> = (0..2)
+ .map(|_| {
+ let path = path.clone();
+ let barrier = Arc::clone(&barrier);
+ thread::spawn(move || {
+ barrier.wait();
+ for _ in 0..CYCLES {
+ let db = VecDb::open(&path, DIMS).unwrap();
+ assert!(db.contains("seed"));
+ drop(db);
+ }
+ })
+ })
+ .collect();
+ for churner in churners {
+ churner.join().unwrap();
+ }
+ let reopened = open_writer(&path);
+ assert!(reopened.contains("seed"));
+ }
+
#[test]
fn a_stalled_open_on_one_path_blocks_neither_other_paths_nor_forks_its_own() {
let dir = TempDir::new().unwrap();