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

Tests: Fix the retry loop for the reserve6 helpers.

Browse Source 
We should exit the loop once we have a command that is NOT
aborted with unit attention.

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2016-02-23 21:34:34 -08:00
parent 2feb4d40db
commit c5bc0a49b0
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2011,11 +2011,11 @@ int
release6(struct scsi_device *sdev) release6(struct scsi_device *sdev)
{ {
struct scsi_task *task; struct scsi_task *task;
int i, res = 0; int i, res = -1;
logging(LOG_VERBOSE, "Send RELEASE6"); logging(LOG_VERBOSE, "Send RELEASE6");
for (i = 0; i < 3 && res == 0; ++i) { for (i = 0; i < 3 && res != 0; ++i) {
task = scsi_cdb_release6(); task = scsi_cdb_release6();
assert(task != NULL); assert(task != NULL);
@@ -2035,6 +2035,8 @@ release6(struct scsi_device *sdev)
"failed with sense. %s", "failed with sense. %s",
iscsi_get_error(sdev->iscsi_ctx)); iscsi_get_error(sdev->iscsi_ctx));
res = -1; res = -1;
} else {
res = 0;
} }
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
} }
@@ -2073,11 +2075,11 @@ int
reserve6(struct scsi_device *sdev) reserve6(struct scsi_device *sdev)
{ {
struct scsi_task *task; struct scsi_task *task;
int i, res = 0; int i, res = -1;
logging(LOG_VERBOSE, "Send RESERVE6"); logging(LOG_VERBOSE, "Send RESERVE6");
for (i = 0; i < 3 && res == 0; ++i) { for (i = 0; i < 3 && res != 0; ++i) {
task = scsi_cdb_reserve6(); task = scsi_cdb_reserve6();
assert(task != NULL); assert(task != NULL);
@@ -2101,6 +2103,8 @@ reserve6(struct scsi_device *sdev)
"failed with sense. %s", "failed with sense. %s",
iscsi_get_error(sdev->iscsi_ctx)); iscsi_get_error(sdev->iscsi_ctx));
res = -1; res = -1;
} else {
res = 0;
} }
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
} }
@@ -2114,11 +2118,11 @@ int
reserve6_conflict(struct scsi_device *sdev) reserve6_conflict(struct scsi_device *sdev)
{ {
struct scsi_task *task; struct scsi_task *task;
int i, res = 0; int i, res = -1;
logging(LOG_VERBOSE, "Send RESERVE6 (Expecting RESERVATION_CONFLICT)"); logging(LOG_VERBOSE, "Send RESERVE6 (Expecting RESERVATION_CONFLICT)");
for (i = 0; i < 3 && res == 0; ++i) { for (i = 0; i < 3 && res != 0; ++i) {
task = scsi_cdb_reserve6(); task = scsi_cdb_reserve6();
assert(task != NULL); assert(task != NULL);
@@ -2141,6 +2145,8 @@ reserve6_conflict(struct scsi_device *sdev)
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; res = -1;
} else {
res = 0;
} }
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
} }