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

src/backup/backup_info.rs: remove BackupGroup lock()

Browse Source 
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Dietmar Maurer
2020-08-11 10:50:37 +02:00
parent 3dc1a2d5b6
commit e434258592
2 changed files with 5 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/backup/backup_info.rs
View File

@ -3,16 +3,12 @@ use crate::tools;
use anyhow::{bail, format_err, Error};
use regex::Regex;
use std::os::unix::io::RawFd;
use nix::dir::Dir;
use std::time::Duration;
use chrono::{DateTime, TimeZone, SecondsFormat, Utc};
use std::path::{PathBuf, Path};
use lazy_static::lazy_static;
use proxmox::sys::error::SysError;
use super::manifest::MANIFEST_BLOB_NAME;
macro_rules! BACKUP_ID_RE { () => (r"[A-Za-z0-9][A-Za-z0-9_-]+") }
@ -40,9 +36,6 @@ lazy_static!{
}
/// Opaque type releasing the corresponding flock when dropped
pub type BackupGroupGuard = Dir;
/// BackupGroup is a directory containing a list of BackupDir
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
pub struct BackupGroup {
@ -137,40 +130,6 @@ impl BackupGroup {
Ok(last)
}
pub fn lock(&self, base_path: &Path) -> Result<BackupGroupGuard, Error> {
use nix::fcntl::OFlag;
use nix::sys::stat::Mode;
let mut path = base_path.to_owned();
path.push(self.group_path());
let mut handle = Dir::open(&path, OFlag::O_RDONLY, Mode::empty())
.map_err(|err| {
format_err!(
"unable to open backup group directory {:?} for locking - {}",
self.group_path(),
err,
)
})?;
// acquire in non-blocking mode, no point in waiting here since other
// backups could still take a very long time
proxmox::tools::fs::lock_file(&mut handle, true, Some(Duration::from_nanos(0)))
.map_err(|err| {
format_err!(
"unable to acquire lock on backup group {:?} - {}",
self.group_path(),
if err.would_block() {
String::from("another backup is already running")
} else {
err.to_string()
}
)
})?;
Ok(handle)
}
pub fn list_groups(base_path: &Path) -> Result<Vec<BackupGroup>, Error> {
let mut list = Vec::new();