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

backup/chunk_store: open base dir in get_chunk_iterator 

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-02-14 11:16:34 +01:00
parent db4868ef4f
commit 9739aca41f
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/backup/chunk_store.rs
View File

@ -191,13 +191,27 @@ impl ChunkStore {
Ok(()) Ok(())
} }
pub fn get_chunk_iterator<'a>( pub fn get_chunk_iterator(
base_handle: &'a nix::dir::Dir, &self,
) -> impl Iterator<Item = Result<tools::fs::ReadDirEntry, Error>> + 'a { ) -> Result<
impl Iterator<Item = Result<tools::fs::ReadDirEntry, Error>>,
Error
> {
use nix::dir::Dir;
use nix::fcntl::OFlag;
use nix::sys::stat::Mode;
let base_handle = match Dir::open(
&self.chunk_dir, OFlag::O_RDONLY, Mode::empty()) {
Ok(h) => h,
Err(err) => bail!("unable to open store '{}' chunk dir {:?} - {}",
self.name, self.chunk_dir, err),
};
let mut verbose = true; let mut verbose = true;
let mut last_percentage = 0; let mut last_percentage = 0;
(0..0x10000).filter_map(move |index| { Ok((0..0x10000).filter_map(move |index| {
let percentage = (index * 100) / 0x10000; let percentage = (index * 100) / 0x10000;
if last_percentage != percentage { if last_percentage != percentage {
last_percentage = percentage; last_percentage = percentage;
@ -215,26 +229,15 @@ impl ChunkStore {
Ok(iter) => Some(iter), Ok(iter) => Some(iter),
} }
}) })
.flatten() .flatten())
} }
pub fn sweep_unused_chunks(&self, status: &mut GarbageCollectionStatus) -> Result<(), Error> { pub fn sweep_unused_chunks(&self, status: &mut GarbageCollectionStatus) -> Result<(), Error> {
use nix::dir::Dir;
use nix::fcntl::OFlag;
use nix::sys::stat::Mode;
use nix::sys::stat::fstatat; use nix::sys::stat::fstatat;
let base_handle = match Dir::open(
&self.chunk_dir, OFlag::O_RDONLY, Mode::empty()) {
Ok(h) => h,
Err(err) => bail!("unable to open store '{}' chunk dir {:?} - {}",
self.name, self.chunk_dir, err),
};
let now = unsafe { libc::time(std::ptr::null_mut()) }; let now = unsafe { libc::time(std::ptr::null_mut()) };
for entry in Self::get_chunk_iterator(&base_handle) { for entry in self.get_chunk_iterator()? {
let (dirfd, entry) = match entry { let (dirfd, entry) = match entry {
Ok(entry) => (entry.parent_fd(), entry), Ok(entry) => (entry.parent_fd(), entry),
Err(_) => continue, // ignore errors Err(_) => continue, // ignore errors