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::{ tools::sgutils2::{
SgRaw, SgRaw,
SENSE_KEY_NO_SENSE,
SENSE_KEY_RECOVERED_ERROR,
SENSE_KEY_UNIT_ATTENTION,
SENSE_KEY_NOT_READY, SENSE_KEY_NOT_READY,
InquiryInfo, InquiryInfo,
ScsiError, ScsiError,
@ -77,11 +74,10 @@ struct AddressAssignmentPage {
} }
/// Execute scsi commands, optionally repeat the command until /// 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 /// Timeout is 5 seconds. If the device reports "Not Ready - becoming
/// UNIT_ATTENTION aborts the loop and returns an error. If the device /// 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 execute_scsi_command<F: AsRawFd>( fn execute_scsi_command<F: AsRawFd>(
@ -100,17 +96,8 @@ fn execute_scsi_command<F: AsRawFd>(
loop { loop {
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) if !retry => bail!("{} failed: {}", error_prefix, err),
Err(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(); let msg = err.to_string();
if let Some(ref last) = last_msg { if let Some(ref last) = last_msg {
if &msg != last { if &msg != last {
@ -122,11 +109,13 @@ fn execute_scsi_command<F: AsRawFd>(
last_msg = Some(msg); last_msg = Some(msg);
} }
if let ScsiError::Sense(ref sense) = err {
// Not Ready - becoming ready // Not Ready - becoming ready
if sense.sense_key == SENSE_KEY_NOT_READY && sense.asc == 0x04 && sense.ascq == 1 { if sense.sense_key == SENSE_KEY_NOT_READY && sense.asc == 0x04 && sense.ascq == 1 {
// wait up to 5 minutes, long enough to finish inventorize // wait up to 5 minutes, long enough to finish inventorize
timeout = std::time::Duration::new(5*60, 0); timeout = std::time::Duration::new(5*60, 0);
} }
}
if start.elapsed()? > timeout { if start.elapsed()? > timeout {
bail!("{} failed: {}", error_prefix, err); bail!("{} failed: {}", error_prefix, err);
@ -137,8 +126,6 @@ fn execute_scsi_command<F: AsRawFd>(
} }
} }
} }
}
}
} }