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

tape: make eject/export more reliable, improve logging

Browse Source
This commit is contained in:
Dietmar Maurer
2021-01-12 09:16:16 +01:00
parent 31cf625af5
commit 5654d8ceba
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,11 +151,9 @@ fn backup_worker(
pool_writer.commit()?;
if export_media_set {
worker.log(format!("exporting current media set"));
pool_writer.export_media_set(worker)?;
} else if eject_media {
worker.log(format!("ejection backup media"));
pool_writer.eject_media()?;
pool_writer.eject_media(worker)?;
}
Ok(())
@ -218,14 +216,14 @@ pub fn backup_snapshot(
let uuid = pool_writer.load_writable_media(worker)?;
let (done, _bytes) = pool_writer.append_snapshot_archive(&snapshot_reader)?;
let (done, _bytes) = pool_writer.append_snapshot_archive(worker, &snapshot_reader)?;
if !done {
// does not fit on tape, so we try on next volume
pool_writer.set_media_status_full(&uuid)?;
pool_writer.load_writable_media(worker)?;
let (done, _bytes) = pool_writer.append_snapshot_archive(&snapshot_reader)?;
let (done, _bytes) = pool_writer.append_snapshot_archive(worker, &snapshot_reader)?;
if !done {
bail!("write_snapshot_archive failed on second media");

23
src/tape/pool_writer.rs
View File

@ -109,7 +109,7 @@ impl PoolWriter {
}
/// Eject media and drop PoolWriterState (close drive)
pub fn eject_media(&mut self) -> Result<(), Error> {
pub fn eject_media(&mut self, worker: &WorkerTask) -> Result<(), Error> {
let mut status = match self.status.take() {
Some(status) => status,
None => return Ok(()), // no media loaded
@ -118,9 +118,13 @@ impl PoolWriter {
let (drive_config, _digest) = crate::config::drive::config()?;
if let Some((mut changer, _)) = media_changer(&drive_config, &self.drive_name)? {
worker.log("eject media");
status.drive.eject_media()?; // rewind and eject early, so that unload_media is faster
drop(status); // close drive
changer.unload_media(None)?;
worker.log("unload media");
changer.unload_media(None)?; //eject and unload
} else {
worker.log("standalone drive - ejecting media");
status.drive.eject_media()?;
}
@ -129,13 +133,19 @@ impl PoolWriter {
/// Export current media set and drop PoolWriterState (close drive)
pub fn export_media_set(&mut self, worker: &WorkerTask) -> Result<(), Error> {
let status = self.status.take();
let mut status = self.status.take();
let (drive_config, _digest) = crate::config::drive::config()?;
if let Some((mut changer, _)) = media_changer(&drive_config, &self.drive_name)? {
if let Some(ref mut status) = status {
worker.log("eject media");
status.drive.eject_media()?; // rewind and eject early, so that unload_media is faster
}
drop(status); // close drive
worker.log("unload media");
changer.unload_media(None)?;
for media_uuid in self.pool.current_media_list()? {
@ -149,8 +159,8 @@ impl PoolWriter {
}
} else {
worker.log("standalone drive - ejecting media instead of export");
if let Some(mut status) = status {
worker.log("standalone drive - ejecting media instead of export");
status.drive.eject_media()?;
}
}
@ -244,6 +254,7 @@ impl PoolWriter {
/// media.
pub fn append_snapshot_archive(
&mut self,
worker: &WorkerTask,
snapshot_reader: &SnapshotReader,
) -> Result<(bool, usize), Error> {
@ -253,6 +264,7 @@ impl PoolWriter {
};
if !status.at_eom {
worker.log(String::from("moving to end of media"));
status.drive.move_to_eom()?;
status.at_eom = true;
}
@ -306,6 +318,7 @@ impl PoolWriter {
};
if !status.at_eom {
worker.log(String::from("moving to end of media"));
status.drive.move_to_eom()?;
status.at_eom = true;
}
@ -457,7 +470,7 @@ fn update_media_set_label(
}
// todo: verify last content/media_catalog somehow?
drive.move_to_eom()?;
drive.move_to_eom()?; // just to be sure
Ok(media_catalog)
}