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

tape: cleanup PoolWriter - factor out common code

Browse Source
This commit is contained in:
Dietmar Maurer 2021-03-19 08:56:14 +01:00
parent 166a48f903
commit eac1beef3c
1 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/tape/pool_writer/mod.rs
View File

@ -287,6 +287,28 @@ impl PoolWriter {
Ok(file) Ok(file)
} }
// Check it tape is loaded, then move to EOM (if not already there)
//
// Returns the tape position at EOM.
fn prepare_tape_write(
status: &mut PoolWriterState,
worker: &WorkerTask,
) -> Result<u64, Error> {
if !status.at_eom {
worker.log(String::from("moving to end of media"));
status.drive.move_to_eom()?;
status.at_eom = true;
}
let current_file_number = status.drive.current_file_number()?;
if current_file_number < 2 {
bail!("got strange file position number from drive ({})", current_file_number);
}
Ok(current_file_number)
}
/// Move to EOM (if not already there), then write the current /// Move to EOM (if not already there), then write the current
/// catalog to the tape. On success, this return 'Ok(true)'. /// catalog to the tape. On success, this return 'Ok(true)'.
@ -304,16 +326,7 @@ impl PoolWriter {
None => bail!("PoolWriter - no media loaded"), None => bail!("PoolWriter - no media loaded"),
}; };
if !status.at_eom { Self::prepare_tape_write(status, worker)?;
worker.log(String::from("moving to end of media"));
status.drive.move_to_eom()?;
status.at_eom = true;
}
let current_file_number = status.drive.current_file_number()?;
if current_file_number < 2 {
bail!("got strange file position number from drive ({})", current_file_number);
}
let catalog_set = self.catalog_set.lock().unwrap(); let catalog_set = self.catalog_set.lock().unwrap();
@ -372,16 +385,7 @@ impl PoolWriter {
None => bail!("PoolWriter - no media loaded"), None => bail!("PoolWriter - no media loaded"),
}; };
if !status.at_eom { Self::prepare_tape_write(status, worker)?;
worker.log(String::from("moving to end of media"));
status.drive.move_to_eom()?;
status.at_eom = true;
}
let current_file_number = status.drive.current_file_number()?;
if current_file_number < 2 {
bail!("got strange file position number from drive ({})", current_file_number);
}
for (seq_nr, uuid) in media_list.iter().enumerate() { for (seq_nr, uuid) in media_list.iter().enumerate() {
@ -431,16 +435,7 @@ impl PoolWriter {
None => bail!("PoolWriter - no media loaded"), None => bail!("PoolWriter - no media loaded"),
}; };
if !status.at_eom { let current_file_number = Self::prepare_tape_write(status, worker)?;
worker.log(String::from("moving to end of media"));
status.drive.move_to_eom()?;
status.at_eom = true;
}
let current_file_number = status.drive.current_file_number()?;
if current_file_number < 2 {
bail!("got strange file position number from drive ({})", current_file_number);
}
let (done, bytes_written) = { let (done, bytes_written) = {
let mut writer: Box<dyn TapeWrite> = status.drive.write_file()?; let mut writer: Box<dyn TapeWrite> = status.drive.write_file()?;
@ -486,16 +481,8 @@ impl PoolWriter {
None => bail!("PoolWriter - no media loaded"), None => bail!("PoolWriter - no media loaded"),
}; };
if !status.at_eom { let current_file_number = Self::prepare_tape_write(status, worker)?;
worker.log(String::from("moving to end of media"));
status.drive.move_to_eom()?;
status.at_eom = true;
}
let current_file_number = status.drive.current_file_number()?;
if current_file_number < 2 {
bail!("got strange file position number from drive ({})", current_file_number);
}
let writer = status.drive.write_file()?; let writer = status.drive.write_file()?;
let start_time = SystemTime::now(); let start_time = SystemTime::now();