Data Recovery: a keeps- entry in an area the same restore or discard holds keeps nothing

Restore and discard hold each crashed app's area until they finish. When
a later area's copies were kept by an entry in an area already held, the
check took a second lock on that area, found it taken, and counted the
area as running, so its copies were listed but neither restored nor
discarded. Areas the command already holds now count as gone in that
check.
This commit is contained in:
dotCooCoo
2026-11-12 01:36:09 -08:00
parent 61650e44a2
commit d5572f8a6c
2 changed files with 39 additions and 10 deletions
+25
View File
@@ -1179,6 +1179,31 @@ fn a_keeps_entry_in_a_running_apps_area_keeps_the_copies() {
assert_eq!(offered(&mut b).len(), 2);
}
/// An entry `<area>/keeps-<left area>` in a crashed app's area keeps nothing while restore or
/// discard holds that area: both crashed apps' copies are restored, and discarded.
#[test]
fn a_keeps_entry_in_a_crashed_apps_area_held_by_the_same_command_keeps_nothing() {
let crashed = |store: &Arc<MemoryStore>| {
let mut s = session_in(store);
s.execute("file.recovery.save", &json!({})).unwrap();
s.recovery.own_area().unwrap().to_string()
};
for cmd in ["file.recovery.restore", "file.recovery.discard"] {
let store = Arc::new(MemoryStore::default());
let a = crashed(&store);
let c = crashed(&store);
assert_ne!(a, c);
// The area that sorts first, which the command holds first, keeps the other one's copies.
let (first, second) = if a < c { (a, c) } else { (c, a) };
store.write(&format!("{first}/keeps-{second}"), b"").unwrap();
let mut b = relaunch(&store);
assert_eq!(offered(&mut b).len(), 2);
let r = b.execute(cmd, &json!({})).unwrap();
let done = if cmd == "file.recovery.restore" { restored(r) } else { r["discarded"].as_array().unwrap().len() };
assert_eq!(done, 2, "{cmd}");
}
}
/// An entry `<area>/keeps-<left area>` in a folder whose lock file can't be opened keeps nothing.
#[cfg(unix)]
#[test]