tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backup: use ChunkIterator for sweep_unused_chunks 

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-02-12 10:35:49 +01:00
parent c9e7f4dc8b
commit fdd71f5286
1 changed files with 39 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/backup/chunk_store.rs
View File

@ -284,44 +284,6 @@ impl ChunkStore {
Ok(()) Ok(())
} }
fn sweep_old_files(&self, handle: &mut nix::dir::Dir, status: &mut GarbageCollectionStatus) -> Result<(), Error> {
let rawfd = handle.as_raw_fd();
let now = unsafe { libc::time(std::ptr::null_mut()) };
for entry in handle.iter() {
let entry = match entry {
Ok(entry) => entry,
Err(_) => continue /* ignore */,
};
let file_type = match entry.file_type() {
Some(file_type) => file_type,
None => bail!("unsupported file system type on chunk store '{}'", self.name),
};
if file_type != nix::dir::Type::File { continue; }
let filename = entry.file_name();
if let Ok(stat) = nix::sys::stat::fstatat(rawfd, filename, nix::fcntl::AtFlags::AT_SYMLINK_NOFOLLOW) {
let age = now - stat.st_atime;
//println!("FOUND {} {:?}", age/(3600*24), filename);
if age/(3600*24) >= 2 {
println!("UNLINK {} {:?}", age/(3600*24), filename);
let res = unsafe { libc::unlinkat(rawfd, filename.as_ptr(), 0) };
if res != 0 {
let err = nix::Error::last();
bail!("unlink chunk {:?} failed on store '{}' - {}", filename, self.name, err);
}
} else {
status.disk_chunks += 1;
status.disk_bytes += stat.st_size as usize;
}
}
}
Ok(())
}
pub fn sweep_unused_chunks(&self, status: &mut GarbageCollectionStatus) -> Result<(), Error> { pub fn sweep_unused_chunks(&self, status: &mut GarbageCollectionStatus) -> Result<(), Error> {
use nix::fcntl::OFlag; use nix::fcntl::OFlag;
@ -335,27 +297,48 @@ impl ChunkStore {
self.name, self.chunk_dir, err), self.name, self.chunk_dir, err),
}; };
let base_fd = base_handle.as_raw_fd(); let mut verbose = true;
let now = unsafe { libc::time(std::ptr::null_mut()) };
let mut last_percentage = 0; let mut last_percentage = 0;
let mut progress = 0;
for i in 0..64*1024 { let iter = ChunkIterator::with_progress(
base_handle,
let percentage = (i*100)/(64*1024); |p| eprintln!("percentage done: {}", p),
if percentage != last_percentage { );
eprintln!("Percentage done: {}", percentage); for entry in iter {
last_percentage = percentage; let (dirfd, entry) = match entry {
} Ok(entry) => entry,
Err(e) => {
let l1name = PathBuf::from(format!("{:04x}", i)); if verbose {
match nix::dir::Dir::openat(base_fd, &l1name, OFlag::O_RDONLY, Mode::empty()) { eprintln!("Error iterating through chunks: {}", e);
Ok(mut h) => { verbose = false;
//println!("SCAN {:?} {:?}", l1name); }
self.sweep_old_files(&mut h, status)?; continue; // ignore
} }
Err(err) => bail!("unable to open store '{}' dir {:?}/{:?} - {}",
self.name, self.chunk_dir, l1name, err),
}; };
let file_type = match entry.file_type() {
Some(file_type) => file_type,
None => bail!("unsupported file system type on chunk store '{}'", self.name),
};
let filename = entry.file_name();
if let Ok(stat) = nix::sys::stat::fstatat(dirfd, filename, nix::fcntl::AtFlags::AT_SYMLINK_NOFOLLOW) {
let age = now - stat.st_atime;
//println!("FOUND {} {:?}", age/(3600*24), filename);
if age/(3600*24) >= 2 {
println!("UNLINK {} {:?}", age/(3600*24), filename);
let res = unsafe { libc::unlinkat(dirfd, filename.as_ptr(), 0) };
if res != 0 {
let err = nix::Error::last();
bail!("unlink chunk {:?} failed on store '{}' - {}", filename, self.name, err);
}
} else {
status.disk_chunks += 1;
status.disk_bytes += stat.st_size as usize;
}
}
} }
Ok(()) Ok(())
} }