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

tape: cleanup - rename 'info' to 'media_id'

Browse Source 
Second try.
This commit is contained in:
Dietmar Maurer 2021-01-03 11:38:00 +01:00
parent 745ec187ce
commit c503ea7045
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/tape/pool_writer.rs
View File

@ -148,7 +148,13 @@ impl PoolWriter {
} }
let (drive_config, _digest) = crate::config::drive::config()?; let (drive_config, _digest) = crate::config::drive::config()?;
let (drive, catalog) = drive_load_and_label_media(worker, &drive_config, &self.drive_name, &media.id())?; let (drive, catalog) = drive_load_and_label_media(
worker,
&drive_config,
&self.drive_name,
&media.id(),
)?;
self.status = Some(PoolWriterState { drive, catalog, at_eom: false, bytes_written: 0 }); self.status = Some(PoolWriterState { drive, catalog, at_eom: false, bytes_written: 0 });
Ok(media_uuid) Ok(media_uuid)
@ -340,7 +346,7 @@ fn drive_load_and_label_media(
media_id: &MediaId, media_id: &MediaId,
) -> Result<(Box<dyn TapeDriver>, MediaCatalog), Error> { ) -> Result<(Box<dyn TapeDriver>, MediaCatalog), Error> {
let (mut tmp_drive, info) = let (mut tmp_drive, old_media_id) =
request_and_load_media(worker, &drive_config, &drive_name, &media_id.label)?; request_and_load_media(worker, &drive_config, &drive_name, &media_id.label)?;
let media_catalog; let media_catalog;
@ -354,16 +360,11 @@ fn drive_load_and_label_media(
let status_path = Path::new(TAPE_STATUS_DIR); let status_path = Path::new(TAPE_STATUS_DIR);
match &info.media_set_label { match &old_media_id.media_set_label {
None => { None => {
println!("wrinting new media set label"); println!("wrinting new media set label");
tmp_drive.write_media_set_label(new_set)?; tmp_drive.write_media_set_label(new_set)?;
media_catalog = MediaCatalog::overwrite(status_path, media_id, true)?;
let info = MediaId {
label: info.label,
media_set_label: Some(new_set.clone()),
};
media_catalog = MediaCatalog::overwrite(status_path, &info, true)?;
} }
Some(media_set_label) => { Some(media_set_label) => {
if new_set.uuid == media_set_label.uuid { if new_set.uuid == media_set_label.uuid {
@ -377,12 +378,7 @@ fn drive_load_and_label_media(
media_set_label.uuid.to_string(), media_set_label.seq_nr); media_set_label.uuid.to_string(), media_set_label.seq_nr);
tmp_drive.write_media_set_label(new_set)?; tmp_drive.write_media_set_label(new_set)?;
media_catalog = MediaCatalog::overwrite(status_path, media_id, true)?;
let info = MediaId {
label: info.label,
media_set_label: Some(new_set.clone()),
};
media_catalog = MediaCatalog::overwrite(status_path, &info, true)?;
} }
} }
} }