change tape drive lock path

New kernel has stricter checks on tmpfs with stick-bit on directories, so some
commands (i.e. proxmox-tape changer status) fails when executed as root, because
permission checks fails when locking the drive.

This patch move the drive locks to /run/proxmox-backup/drive-lock.

Note: This is incompatible to old locking mechmanism, so users may not
run tape backups during update (or running backup can fail).
This commit is contained in:
Dietmar Maurer 2021-07-12 17:23:38 +02:00 committed by Thomas Lamprecht
parent 49e47c491b
commit a0cd0f9cec
3 changed files with 22 additions and 3 deletions

View File

@ -45,6 +45,7 @@ async fn run() -> Result<(), Error> {
proxmox_backup::tape::create_tape_status_dir()?; proxmox_backup::tape::create_tape_status_dir()?;
proxmox_backup::tape::create_drive_state_dir()?; proxmox_backup::tape::create_drive_state_dir()?;
proxmox_backup::tape::create_changer_state_dir()?; proxmox_backup::tape::create_changer_state_dir()?;
proxmox_backup::tape::create_drive_lock_dir()?;
if let Err(err) = generate_auth_key() { if let Err(err) = generate_auth_key() {
bail!("unable to generate auth key - {}", err); bail!("unable to generate auth key - {}", err);

View File

@ -568,7 +568,7 @@ pub fn get_tape_device_state(
config: &SectionConfigData, config: &SectionConfigData,
drive: &str, drive: &str,
) -> Result<Option<String>, Error> { ) -> Result<Option<String>, Error> {
let path = format!("/run/proxmox-backup/drive-state/{}", drive); let path = format!("{}/{}", crate::tape::DRIVE_STATE_DIR, drive);
let state = file_read_optional_string(path)?; let state = file_read_optional_string(path)?;
let device_path = tape_device_path(config, drive)?; let device_path = tape_device_path(config, drive)?;
@ -612,7 +612,7 @@ fn lock_device_path(device_path: &str) -> Result<DeviceLockGuard, TapeLockError>
let lock_name = crate::tools::systemd::escape_unit(device_path, true); let lock_name = crate::tools::systemd::escape_unit(device_path, true);
let mut path = std::path::PathBuf::from("/var/lock"); let mut path = std::path::PathBuf::from(crate::tape::DRIVE_LOCK_DIR);
path.push(lock_name); path.push(lock_name);
let timeout = std::time::Duration::new(10, 0); let timeout = std::time::Duration::new(10, 0);
@ -637,7 +637,7 @@ fn test_device_path_lock(device_path: &str) -> Result<bool, Error> {
let lock_name = crate::tools::systemd::escape_unit(device_path, true); let lock_name = crate::tools::systemd::escape_unit(device_path, true);
let mut path = std::path::PathBuf::from("/var/lock"); let mut path = std::path::PathBuf::from(crate::tape::DRIVE_LOCK_DIR);
path.push(lock_name); path.push(lock_name);
let timeout = std::time::Duration::new(0, 0); let timeout = std::time::Duration::new(0, 0);

View File

@ -48,6 +48,9 @@ pub use pool_writer::*;
/// Directory path where we store all tape status information /// Directory path where we store all tape status information
pub const TAPE_STATUS_DIR: &str = "/var/lib/proxmox-backup/tape"; pub const TAPE_STATUS_DIR: &str = "/var/lib/proxmox-backup/tape";
/// Directory path where we store drive lock file
pub const DRIVE_LOCK_DIR: &str = concat!(PROXMOX_BACKUP_RUN_DIR_M!(), "/drive-lock");
/// Directory path where we store temporary drive state /// Directory path where we store temporary drive state
pub const DRIVE_STATE_DIR: &str = concat!(PROXMOX_BACKUP_RUN_DIR_M!(), "/drive-state"); pub const DRIVE_STATE_DIR: &str = concat!(PROXMOX_BACKUP_RUN_DIR_M!(), "/drive-state");
@ -78,6 +81,21 @@ pub fn create_tape_status_dir() -> Result<(), Error> {
Ok(()) Ok(())
} }
/// Create drive lock dir with correct permission
pub fn create_drive_lock_dir() -> Result<(), Error> {
let backup_user = crate::backup::backup_user()?;
let mode = nix::sys::stat::Mode::from_bits_truncate(0o0750);
let options = CreateOptions::new()
.perm(mode)
.owner(backup_user.uid)
.group(backup_user.gid);
create_path(DRIVE_LOCK_DIR, None, Some(options))
.map_err(|err: Error| format_err!("unable to create drive state dir - {}", err))?;
Ok(())
}
/// Create drive state dir with correct permission /// Create drive state dir with correct permission
pub fn create_drive_state_dir() -> Result<(), Error> { pub fn create_drive_state_dir() -> Result<(), Error> {
let backup_user = crate::backup::backup_user()?; let backup_user = crate::backup::backup_user()?;