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

tape: rename retry_command to execute_scsi_command, make retry a flag

Browse Source
This commit is contained in:
Dietmar Maurer
2021-01-27 09:34:24 +01:00
parent ec8d9c6b80
commit 16b4d78400
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tape/changer/sg_pt_changer.rs
View File

@ -74,17 +74,19 @@ struct AddressAssignmentPage {
reserved23: u8, reserved23: u8,
} }
/// Repeat command until sucessful, sleep 1 second between invovations /// Execute scsi commands, optionally repeat the command until
/// successful (sleep 1 second between invovations)
/// ///
/// Any Sense key other than NO_SENSE, RECOVERED_ERROR, NOT_READY and /// Any Sense key other than NO_SENSE, RECOVERED_ERROR, NOT_READY and
/// UNIT_ATTENTION aborts the loop and returns an error. If the device /// UNIT_ATTENTION aborts the loop and returns an error. If the device
/// reports "Not Ready - becoming ready", we wait up to 5 minutes. /// reports "Not Ready - becoming ready", we wait up to 5 minutes.
/// ///
/// Skipped errors are printed on stderr. /// Skipped errors are printed on stderr.
fn retry_command<F: AsRawFd>( fn execute_scsi_command<F: AsRawFd>(
sg_raw: &mut SgRaw<F>, sg_raw: &mut SgRaw<F>,
cmd: &[u8], cmd: &[u8],
error_prefix: &str, error_prefix: &str,
retry: bool,
) -> Result<Vec<u8>, Error> { ) -> Result<Vec<u8>, Error> {
let start = std::time::SystemTime::now(); let start = std::time::SystemTime::now();
@ -97,6 +99,9 @@ fn retry_command<F: AsRawFd>(
match sg_raw.do_command(&cmd) { match sg_raw.do_command(&cmd) {
Ok(data) => return Ok(data.to_vec()), Ok(data) => return Ok(data.to_vec()),
Err(err) => { Err(err) => {
if !retry {
bail!("{} failed: {}", error_prefix, err);
}
if let Some(ref sense) = err.sense { if let Some(ref sense) = err.sense {
if sense.sense_key == SENSE_KEY_NO_SENSE || if sense.sense_key == SENSE_KEY_NO_SENSE ||
@ -151,7 +156,7 @@ fn read_element_address_assignment<F: AsRawFd>(
cmd.push(allocation_len); // allocation len cmd.push(allocation_len); // allocation len
cmd.push(0); //control cmd.push(0); //control
let data = retry_command(&mut sg_raw, &cmd, "read element address assignment")?; let data = execute_scsi_command(&mut sg_raw, &cmd, "read element address assignment", true)?;
proxmox::try_block!({ proxmox::try_block!({
let mut reader = &data[..]; let mut reader = &data[..];
@ -315,13 +320,17 @@ pub fn read_element_status<F: AsRawFd>(file: &mut F) -> Result<MtxStatus, Error>
let mut import_export_slots = Vec::new(); let mut import_export_slots = Vec::new();
let mut transports = Vec::new(); let mut transports = Vec::new();
let mut retry = true;
loop { loop {
let cmd = scsi_read_element_status_cdb(start_element_address, allocation_len); let cmd = scsi_read_element_status_cdb(start_element_address, allocation_len);
let data = retry_command(&mut sg_raw, &cmd, "read element status (B8h)")?; let data = execute_scsi_command(&mut sg_raw, &cmd, "read element status (B8h)", retry)?;
let page = decode_element_status_page(&inquiry, &data, start_element_address)?; let page = decode_element_status_page(&inquiry, &data, start_element_address)?;
retry = false; // only retry the first command
transports.extend(page.transports); transports.extend(page.transports);
drives.extend(page.drives); drives.extend(page.drives);
storage_slots.extend(page.storage_slots); storage_slots.extend(page.storage_slots);