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

tape: changer: sg_pt: always retry until timeout

This commit is contained in:
Dietmar Maurer 2021-07-13 10:39:28 +02:00
parent a14a1c7b90
commit 9ee4c23833
1 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,9 +23,6 @@ use crate::{
},
tools::sgutils2::{
SgRaw,
SENSE_KEY_NO_SENSE,
SENSE_KEY_RECOVERED_ERROR,
SENSE_KEY_UNIT_ATTENTION,
SENSE_KEY_NOT_READY,
InquiryInfo,
ScsiError,
@ -77,11 +74,10 @@ struct AddressAssignmentPage {
}
/// Execute scsi commands, optionally repeat the command until
/// successful (sleep 1 second between invovations)
/// successful or timeout (sleep 1 second between invovations)
///
/// Any Sense key other than NO_SENSE, RECOVERED_ERROR, NOT_READY and
/// UNIT_ATTENTION aborts the loop and returns an error. If the device
/// reports "Not Ready - becoming ready", we wait up to 5 minutes.
/// Timeout is 5 seconds. If the device reports "Not Ready - becoming
/// ready", we wait up to 5 minutes.
///
/// Skipped errors are printed on stderr.
fn execute_scsi_command<F: AsRawFd>(
@ -100,17 +96,8 @@ fn execute_scsi_command<F: AsRawFd>(
loop {
match sg_raw.do_command(&cmd) {
Ok(data) => return Ok(data.to_vec()),
Err(err) if !retry => bail!("{} failed: {}", error_prefix, err),
Err(err) => {
if !retry {
bail!("{} failed: {}", error_prefix, err);
}
if let ScsiError::Sense(ref sense) = err {
if sense.sense_key == SENSE_KEY_NO_SENSE ||
sense.sense_key == SENSE_KEY_RECOVERED_ERROR ||
sense.sense_key == SENSE_KEY_UNIT_ATTENTION ||
sense.sense_key == SENSE_KEY_NOT_READY
{
let msg = err.to_string();
if let Some(ref last) = last_msg {
if &msg != last {
@ -122,11 +109,13 @@ fn execute_scsi_command<F: AsRawFd>(
last_msg = Some(msg);
}
if let ScsiError::Sense(ref sense) = err {
// Not Ready - becoming ready
if sense.sense_key == SENSE_KEY_NOT_READY && sense.asc == 0x04 && sense.ascq == 1 {
// wait up to 5 minutes, long enough to finish inventorize
timeout = std::time::Duration::new(5*60, 0);
}
}
if start.elapsed()? > timeout {
bail!("{} failed: {}", error_prefix, err);
@ -138,8 +127,6 @@ fn execute_scsi_command<F: AsRawFd>(
}
}
}
}
}
fn read_element_address_assignment<F: AsRawFd>(