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

tape: remove drive from pool config

Browse Source
This commit is contained in:
Dietmar Maurer
2021-02-01 09:14:28 +01:00
parent 83b8949a98
commit 9883b54cba
6 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ use crate::{
Authid,
DATASTORE_SCHEMA,
MEDIA_POOL_NAME_SCHEMA,
DRIVE_NAME_SCHEMA,
UPID_SCHEMA,
MediaPoolConfig,
},
@ -53,6 +54,9 @@ use crate::{
pool: {
schema: MEDIA_POOL_NAME_SCHEMA,
},
drive: {
schema: DRIVE_NAME_SCHEMA,
},
"eject-media": {
description: "Eject media upon job completion.",
type: bool,
@ -73,6 +77,7 @@ use crate::{
pub fn backup(
store: String,
pool: String,
drive: String,
eject_media: Option<bool>,
export_media_set: Option<bool>,
rpcenv: &mut dyn RpcEnvironment,
@ -87,7 +92,7 @@ pub fn backup(
let (drive_config, _digest) = config::drive::config()?;
// early check before starting worker
check_drive_exists(&drive_config, &pool_config.drive)?;
check_drive_exists(&drive_config, &drive)?;
let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
@ -100,7 +105,7 @@ pub fn backup(
auth_id,
to_stdout,
move |worker| {
backup_worker(&worker, datastore, &pool_config, eject_media, export_media_set)?;
backup_worker(&worker, datastore, &drive, &pool_config, eject_media, export_media_set)?;
Ok(())
}
)?;
@ -115,6 +120,7 @@ pub const ROUTER: Router = Router::new()
fn backup_worker(
worker: &WorkerTask,
datastore: Arc<DataStore>,
drive: &str,
pool_config: &MediaPoolConfig,
eject_media: bool,
export_media_set: bool,
@ -125,13 +131,13 @@ 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(&pool_config.drive)?;
let has_changer = update_media_online_status(drive)?;
let use_offline_media = !has_changer;
let pool = MediaPool::with_config(status_path, &pool_config, use_offline_media)?;
let mut pool_writer = PoolWriter::new(pool, &pool_config.drive)?;
let mut pool_writer = PoolWriter::new(pool, drive)?;
let mut group_list = BackupInfo::list_backup_groups(&datastore.base_path())?;

14
src/api2/tape/restore.rs
View File

@ -27,6 +27,7 @@ use crate::{
tools::compute_file_csum,
api2::types::{
DATASTORE_SCHEMA,
DRIVE_NAME_SCHEMA,
UPID_SCHEMA,
Authid,
MediaPoolConfig,
@ -82,6 +83,9 @@ pub const ROUTER: Router = Router::new()
store: {
schema: DATASTORE_SCHEMA,
},
drive: {
schema: DRIVE_NAME_SCHEMA,
},
"media-set": {
description: "Media set UUID.",
type: String,
@ -95,6 +99,7 @@ pub const ROUTER: Router = Router::new()
/// Restore data from media-set
pub fn restore(
store: String,
drive: String,
media_set: String,
rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
@ -110,12 +115,13 @@ pub fn restore(
let pool = inventory.lookup_media_set_pool(&media_set_uuid)?;
// check if pool exists
let (config, _digest) = config::media_pool::config()?;
let pool_config: MediaPoolConfig = config.lookup("pool", &pool)?;
let _pool_config: MediaPoolConfig = config.lookup("pool", &pool)?;
let (drive_config, _digest) = config::drive::config()?;
// early check before starting worker
check_drive_exists(&drive_config, &pool_config.drive)?;
check_drive_exists(&drive_config, &drive)?;
let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
@ -153,8 +159,6 @@ pub fn restore(
}
}
let drive = &pool_config.drive;
worker.log(format!("Restore mediaset '{}'", media_set));
if let Some(fingerprint) = encryption_key_fingerprint {
worker.log(format!("Encryption key fingerprint: {}", fingerprint));
@ -175,7 +179,7 @@ pub fn restore(
&worker,
media_id,
&drive_config,
drive,
&drive,
&datastore,
&auth_id,
)?;