mirror of
https://github.com/narrrl/proton-drive-linux.git
synced 2026-11-17 17:55:03 +01:00
fix(fuse): keep pinned files on disk through remote changes
A remote change to a pinned file called `ContentCache::evict`, which does not check pins, and only the pin request itself ever downloaded anything. An edit from another device, or even a rename, left the file listed as kept offline with no copy, so the next read downloaded it or failed without a network. A file added to a pinned folder elsewhere was never downloaded, and a folder pin whose downloads failed while offline never retried them. A remote change no longer evicts a pinned file's copy. The copy is checked against the revision's (mtime, size), so a newer revision does not read it, and a rename keeps the mtime (B123), so the copy stays valid. A new pdfs-pin-keeper thread checks pins again and downloads files that are missing or stale: - the pins a batch of remote events changed, after the batch's listings are dropped, including a pinned folder that gets a new file; - every pin at startup, when the link returns, and after the event feed loses continuity; - a file whose version is restored. Failed downloads retry with a backoff of 30 s to 30 min. Pinning and the keeper settle a provisional size first: a copy stored under the ciphertext size never matched the plaintext it holds. Fixes B282.
This commit is contained in:
1 parent
3f45e89391
commit
14a663cee9
10 files changed
+460
-15
No files matched your search
@@ -3497,6 +3497,68 @@ mod tests {
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[ignore = "mounts FUSE: run with `cargo test -p pdfs-fuse sim:: -- --ignored`"]
|
||||
fn a_file_kept_offline_stays_on_disk_through_changes_made_elsewhere() {
|
||||
// A change from another device deleted a pinned file's copy and
|
||||
// nothing downloaded it again, and a file added to a pinned folder
|
||||
// elsewhere was never downloaded: both were listed as kept offline
|
||||
// and read only with a network (B282).
|
||||
let drive = FakeDrive::new();
|
||||
let dir = scratch("pin-keeper");
|
||||
let daemon = Daemon::start(&dir, drive.client(1, Faults::lan())).unwrap();
|
||||
std::fs::create_dir(daemon.mountpoint.join("Docs")).unwrap();
|
||||
std::fs::write(daemon.mountpoint.join("Docs/a.txt"), b"first").unwrap();
|
||||
std::fs::write(daemon.mountpoint.join("solo.txt"), b"alone").unwrap();
|
||||
assert!(wait_until(Duration::from_secs(30), || {
|
||||
daemon.pending().is_ok_and(|items| items.is_empty())
|
||||
&& drive.lookup("Docs/a.txt").is_some()
|
||||
&& drive.lookup("solo.txt").is_some()
|
||||
}));
|
||||
daemon.request(&Request::PurgeCache).unwrap();
|
||||
let entry = |folder: &str, name: &str| match daemon.request(&Request::ListDir {
|
||||
path: folder.into(),
|
||||
}) {
|
||||
Ok(Response::Entries { entries }) => entries.into_iter().find(|e| e.name == name),
|
||||
_ => None,
|
||||
};
|
||||
for path in ["Docs", "solo.txt"] {
|
||||
let pinned = daemon.request(&Request::Pin { path: path.into() }).unwrap();
|
||||
assert!(matches!(pinned, Response::Ok { .. }), "{pinned:?}");
|
||||
}
|
||||
assert!(wait_until(Duration::from_secs(30), || {
|
||||
entry("Docs", "a.txt").is_some_and(|e| e.cached)
|
||||
&& entry("", "solo.txt").is_some_and(|e| e.cached)
|
||||
}));
|
||||
|
||||
// Another device edits both files and adds one to the kept folder.
|
||||
drive.device().write("Docs/a.txt", b"second, and longer");
|
||||
drive.device().write("solo.txt", b"alone, edited");
|
||||
drive.device().write("Docs/new.txt", b"made elsewhere");
|
||||
assert!(
|
||||
wait_until(Duration::from_secs(60), || {
|
||||
entry("Docs", "a.txt").is_some_and(|e| e.cached && e.size == 18)
|
||||
&& entry("", "solo.txt").is_some_and(|e| e.cached && e.size == 13)
|
||||
&& entry("Docs", "new.txt").is_some_and(|e| e.cached)
|
||||
}),
|
||||
"the keeper downloaded the new content: {:?} {:?} {:?}",
|
||||
entry("Docs", "a.txt"),
|
||||
entry("", "solo.txt"),
|
||||
entry("Docs", "new.txt"),
|
||||
);
|
||||
|
||||
// With the link gone, only the kept copies can answer.
|
||||
daemon.client.set_online(false);
|
||||
let read = |rel: &str| std::fs::read(daemon.mountpoint.join(rel)).unwrap();
|
||||
assert_eq!(read("Docs/a.txt"), b"second, and longer");
|
||||
assert_eq!(read("solo.txt"), b"alone, edited");
|
||||
assert_eq!(read("Docs/new.txt"), b"made elsewhere");
|
||||
daemon.client.set_online(true);
|
||||
|
||||
assert!(matches!(daemon.stop(), Ok(MountOutcome::Shutdown)));
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
}
|
||||
|
||||
/// The synced folder `id` as the daemon lists it.
|
||||
fn listed_folder(daemon: &Daemon, id: i64) -> Option<control::SyncFolderInfo> {
|
||||
match daemon.request(&Request::ListSyncFolders) {
|
||||
|
||||
Reference in new issue
Block a user