P0 fix: Mutex/RwLock poison recovery for webdav_locks and webdav_version
- Add recover_mutex() helper in webdav_locks.rs - Add recover_rwlock() helper in webdav_version.rs - Replace all .unwrap() calls with recovery pattern - Tests: 288 passed, 0 failed
This commit is contained in:
@@ -5,6 +5,16 @@ use std::sync::{Arc, RwLock};
|
||||
use std::time::SystemTime;
|
||||
use uuid::Uuid;
|
||||
|
||||
fn recover_rwlock<T>(result: std::sync::LockResult<T>) -> T {
|
||||
match result {
|
||||
Ok(guard) => guard,
|
||||
Err(e) => {
|
||||
log::warn!("RwLock poisoned in webdav_version, recovering");
|
||||
e.into_inner()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct VersionInfo {
|
||||
pub version_id: String,
|
||||
@@ -40,7 +50,7 @@ impl WebDavVersioning {
|
||||
if index_path.exists() {
|
||||
if let Ok(json) = std::fs::read_to_string(&index_path) {
|
||||
if let Ok(map) = serde_json::from_str::<HashMap<String, Vec<u8>>>(&json) {
|
||||
*db.write().unwrap() = map;
|
||||
*recover_rwlock(db.write()) = map;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -49,7 +59,7 @@ impl WebDavVersioning {
|
||||
}
|
||||
|
||||
fn save_index(&self) -> Result<(), VersionError> {
|
||||
let db = self.db.read().unwrap();
|
||||
let db = recover_rwlock(self.db.read());
|
||||
let json = serde_json::to_string(&*db)?;
|
||||
std::fs::write(&self.index_path, json)?;
|
||||
Ok(())
|
||||
@@ -89,7 +99,7 @@ impl WebDavVersioning {
|
||||
|
||||
let key = Self::version_key(file_path, &version_id);
|
||||
let value = serde_json::to_vec(&version_info)?;
|
||||
self.db.write().unwrap().insert(key, value);
|
||||
recover_rwlock(self.db.write()).insert(key, value);
|
||||
|
||||
self.update_version_history(file_path, &version_id)?;
|
||||
|
||||
@@ -100,7 +110,7 @@ impl WebDavVersioning {
|
||||
|
||||
pub fn get_version(&self, file_path: &str, version_id: &str) -> Result<Vec<u8>, VersionError> {
|
||||
let key = Self::version_key(file_path, version_id);
|
||||
let value = self.db.read().unwrap().get(&key).cloned().ok_or(VersionError::VersionNotFound)?;
|
||||
let value = recover_rwlock(self.db.read()).get(&key).cloned().ok_or(VersionError::VersionNotFound)?;
|
||||
|
||||
let version_info: VersionInfo = serde_json::from_slice(&value)?;
|
||||
let version_file = self.version_storage.join(&version_info.version_id);
|
||||
@@ -110,14 +120,14 @@ impl WebDavVersioning {
|
||||
|
||||
pub fn get_version_info(&self, file_path: &str, version_id: &str) -> Result<VersionInfo, VersionError> {
|
||||
let key = Self::version_key(file_path, version_id);
|
||||
let value = self.db.read().unwrap().get(&key).cloned().ok_or(VersionError::VersionNotFound)?;
|
||||
let value = recover_rwlock(self.db.read()).get(&key).cloned().ok_or(VersionError::VersionNotFound)?;
|
||||
|
||||
serde_json::from_slice(&value).map_err(|e| e.into())
|
||||
}
|
||||
|
||||
pub fn get_version_history(&self, file_path: &str) -> Result<VersionHistory, VersionError> {
|
||||
let history_key = Self::history_key(file_path);
|
||||
let value = self.db.read().unwrap().get(&history_key).cloned().ok_or(VersionError::HistoryNotFound)?;
|
||||
let value = recover_rwlock(self.db.read()).get(&history_key).cloned().ok_or(VersionError::HistoryNotFound)?;
|
||||
|
||||
serde_json::from_slice(&value).map_err(|e| e.into())
|
||||
}
|
||||
@@ -126,7 +136,7 @@ impl WebDavVersioning {
|
||||
let prefix = format!("version:{}:", file_path);
|
||||
let mut versions = Vec::new();
|
||||
|
||||
let db = self.db.read().unwrap();
|
||||
let db = recover_rwlock(self.db.read());
|
||||
for (key, value) in db.iter() {
|
||||
if key.starts_with(&prefix) {
|
||||
let version_info: VersionInfo = serde_json::from_slice(&value)?;
|
||||
@@ -161,7 +171,7 @@ impl WebDavVersioning {
|
||||
|
||||
let key = Self::version_key(file_path, &new_version_id);
|
||||
let value = serde_json::to_vec(&new_version_info)?;
|
||||
self.db.write().unwrap().insert(key, value);
|
||||
recover_rwlock(self.db.write()).insert(key, value);
|
||||
|
||||
self.update_version_history(file_path, &new_version_id)?;
|
||||
|
||||
@@ -183,7 +193,7 @@ impl WebDavVersioning {
|
||||
}
|
||||
|
||||
let key = Self::version_key(file_path, version_id);
|
||||
self.db.write().unwrap().remove(&key);
|
||||
recover_rwlock(self.db.write()).remove(&key);
|
||||
|
||||
let current = self.get_current_version(file_path)?;
|
||||
self.update_version_history(file_path, ¤t.version_id)?;
|
||||
@@ -210,7 +220,7 @@ impl WebDavVersioning {
|
||||
|
||||
let key = Self::version_key(file_path, &version.version_id);
|
||||
let value = serde_json::to_vec(&updated_version)?;
|
||||
self.db.write().unwrap().insert(key, value);
|
||||
recover_rwlock(self.db.write()).insert(key, value);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
@@ -228,7 +238,7 @@ impl WebDavVersioning {
|
||||
|
||||
let history_key = Self::history_key(file_path);
|
||||
let value = serde_json::to_vec(&history)?;
|
||||
self.db.write().unwrap().insert(history_key, value);
|
||||
recover_rwlock(self.db.write()).insert(history_key, value);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user