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

tape: MediaPool - replace use_offline_media with changer_name

Browse Source 
This way, we can improve location_is_available, because we only
consider media from that changer as available.
This commit is contained in:
Dietmar Maurer
2021-02-04 10:15:18 +01:00
parent b81e37f6ab
commit cdf39e62b3
4 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/api2/tape/backup.rs
View File

@ -131,11 +131,9 @@ fn backup_worker(
let _lock = MediaPool::lock(status_path, &pool_config.name)?;
task_log!(worker, "update media online status");
let has_changer = update_media_online_status(drive)?;
let changer_name = update_media_online_status(drive)?;
let use_offline_media = !has_changer;
let pool = MediaPool::with_config(status_path, &pool_config, use_offline_media)?;
let pool = MediaPool::with_config(status_path, &pool_config, changer_name)?;
let mut pool_writer = PoolWriter::new(pool, drive)?;
@ -168,17 +166,13 @@ fn backup_worker(
}
// Try to update the the media online status
fn update_media_online_status(drive: &str) -> Result<bool, Error> {
fn update_media_online_status(drive: &str) -> Result<Option<String>, Error> {
let (config, _digest) = config::drive::config()?;
let mut has_changer = false;
if let Ok(Some((mut changer, changer_name))) = media_changer(&config, drive) {
has_changer = true;
let label_text_list = changer.online_media_label_texts()?;
let label_text_list = changer.online_media_label_texts()?;
let status_path = Path::new(TAPE_STATUS_DIR);
let mut inventory = Inventory::load(status_path)?;
@ -189,9 +183,11 @@ fn update_media_online_status(drive: &str) -> Result<bool, Error> {
&changer_name,
&label_text_list,
)?;
}
Ok(has_changer)
Ok(Some(changer_name))
} else {
Ok(None)
}
}
pub fn backup_snapshot(

4
src/api2/tape/media.rs
View File

@ -86,8 +86,8 @@ pub async fn list_media(pool: Option<String>) -> Result<Vec<MediaListEntry>, Err
let config: MediaPoolConfig = config.lookup("pool", pool_name)?;
let use_offline_media = true; // does not matter here
let pool = MediaPool::with_config(status_path, &config, use_offline_media)?;
let changer_name = None; // does not matter here
let pool = MediaPool::with_config(status_path, &config, changer_name)?;
let current_time = proxmox::tools::time::epoch_i64();