admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Retry RESERVE6/RELEASE6 upon BUS RESET UA

Browse Source 
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
This commit is contained in:
Bart Van Assche
2013-06-07 16:20:55 +02:00
committed by Ronnie Sahlberg
parent 49d1145a10
commit 12f93b60c7
1 changed files with 78 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
test-tool/iscsi-support.c
View File

@@ -2825,25 +2825,34 @@ int
release6(struct iscsi_context *iscsi, int lun) release6(struct iscsi_context *iscsi, int lun)
{ {
struct scsi_task *task; struct scsi_task *task;
int i, res = 0;
logging(LOG_VERBOSE, "Send RELEASE6"); logging(LOG_VERBOSE, "Send RELEASE6");
for (i = 0; i < 3 && res == 0; ++i) {
task = iscsi_release6_sync(iscsi, lun); task = iscsi_release6_sync(iscsi, lun);
if (task == NULL) { if (task == NULL) {
logging(LOG_NORMAL, "[FAILED] Failed to send RELEASE6 command: %s", logging(LOG_NORMAL,
"[FAILED] Failed to send RELEASE6 command: %s",
iscsi_get_error(iscsi)); iscsi_get_error(iscsi));
return -1; res = -1;
break;
} }
if (task->status != SCSI_STATUS_GOOD) { if (task->status != SCSI_STATUS_GOOD &&
!(task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_UNIT_ATTENTION
&& task->sense.ascq == SCSI_SENSE_ASCQ_BUS_RESET)) {
logging(LOG_NORMAL, "[FAILED] RELEASE6 command: " logging(LOG_NORMAL, "[FAILED] RELEASE6 command: "
"failed with sense. %s", iscsi_get_error(iscsi)); "failed with sense. %s",
iscsi_get_error(iscsi));
res = -1;
}
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -1;
} }
scsi_free_scsi_task(task); if (res == 0)
logging(LOG_VERBOSE, "[OK] RELEASE6 returned SUCCESS."); logging(LOG_VERBOSE, "[OK] RELEASE6 returned SUCCESS.");
return 0; return res;
} }
int report_supported_opcodes(struct iscsi_context *iscsi, int lun, int rctd, int options, int opcode, int sa, int alloc_len, struct scsi_task **save_task) int report_supported_opcodes(struct iscsi_context *iscsi, int lun, int rctd, int options, int opcode, int sa, int alloc_len, struct scsi_task **save_task)
@@ -2935,64 +2944,80 @@ int
reserve6(struct iscsi_context *iscsi, int lun) reserve6(struct iscsi_context *iscsi, int lun)
{ {
struct scsi_task *task; struct scsi_task *task;
int i, res = 0;
logging(LOG_VERBOSE, "Send RESERVE6"); logging(LOG_VERBOSE, "Send RESERVE6");
for (i = 0; i < 3 && res == 0; ++i) {
task = iscsi_reserve6_sync(iscsi, lun); task = iscsi_reserve6_sync(iscsi, lun);
if (task == NULL) { if (task == NULL) {
logging(LOG_NORMAL, "[FAILED] Failed to send RESERVE6 command: %s", logging(LOG_NORMAL,
"[FAILED] Failed to send RESERVE6 command: %s",
iscsi_get_error(iscsi)); iscsi_get_error(iscsi));
return -1; res = -1;
break;
} }
if (task->status == SCSI_STATUS_CHECK_CONDITION if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST && task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
logging(LOG_NORMAL, "[SKIPPED] RESERVE6 is not implemented on target"); logging(LOG_NORMAL, "[SKIPPED] RESERVE6 is not "
scsi_free_scsi_task(task); "implemented on target");
return -2; res = -2;
} } else if (task->status != SCSI_STATUS_GOOD &&
if (task->status != SCSI_STATUS_GOOD) { !(task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_UNIT_ATTENTION
&& task->sense.ascq == SCSI_SENSE_ASCQ_BUS_RESET)) {
logging(LOG_NORMAL, "[FAILED] RESERVE6 command: " logging(LOG_NORMAL, "[FAILED] RESERVE6 command: "
"failed with sense. %s", iscsi_get_error(iscsi)); "failed with sense. %s",
iscsi_get_error(iscsi));
res = -1;
}
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -1;
} }
scsi_free_scsi_task(task); if (res == 0)
logging(LOG_VERBOSE, "[OK] RESERVE6 returned SUCCESS."); logging(LOG_VERBOSE, "[OK] RESERVE6 returned SUCCESS.");
return 0; return res;
} }
int int
reserve6_conflict(struct iscsi_context *iscsi, int lun) reserve6_conflict(struct iscsi_context *iscsi, int lun)
{ {
struct scsi_task *task; struct scsi_task *task;
int i, res = 0;
logging(LOG_VERBOSE, "Send RESERVE6 (Expecting RESERVATION_CONFLICT)"); logging(LOG_VERBOSE, "Send RESERVE6 (Expecting RESERVATION_CONFLICT)");
for (i = 0; i < 3 && res == 0; ++i) {
task = iscsi_reserve6_sync(iscsi, lun); task = iscsi_reserve6_sync(iscsi, lun);
if (task == NULL) { if (task == NULL) {
logging(LOG_NORMAL, "[FAILED] Failed to send RESERVE6 command: %s", logging(LOG_NORMAL,
"[FAILED] Failed to send RESERVE6 command: %s",
iscsi_get_error(iscsi)); iscsi_get_error(iscsi));
return -1; res = -1;
break;
} }
if (task->status == SCSI_STATUS_CHECK_CONDITION if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST && task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
logging(LOG_NORMAL, "[SKIPPED] RESERVE6 is not implemented on target"); logging(LOG_NORMAL, "[SKIPPED] RESERVE6 is not"
scsi_free_scsi_task(task); " implemented on target");
return -2; res = -2;
} } else if (task->status != SCSI_STATUS_RESERVATION_CONFLICT &&
if (task->status != SCSI_STATUS_RESERVATION_CONFLICT) { !(task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_UNIT_ATTENTION
&& task->sense.ascq == SCSI_SENSE_ASCQ_BUS_RESET)) {
logging(LOG_NORMAL, "[FAILED] RESERVE6 command: " logging(LOG_NORMAL, "[FAILED] RESERVE6 command: "
"should have failed with RESERVATION_CONFLICT"); "should have failed with RESERVATION_CONFLICT");
res = -1;
}
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
return -1;
} }
scsi_free_scsi_task(task); if (res == 0)
logging(LOG_VERBOSE, "[OK] RESERVE6 returned RESERVATION_CONFLICT."); logging(LOG_VERBOSE,
return 0; "[OK] RESERVE6 returned RESERVATION_CONFLICT.");
return res;
} }
int int