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

connect.c: remove UA whitelist and just consume up to 10 UAs before failing

Browse Source 
Lets not use a whitelist of UnitAttentions that we consume during the connect
phase. Instead we can just loop and fail after the 10th.
If there are more than 10 UAs then we have a problem, otherwise
just consume them all, forget them  and then pass control back to the caller.

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2014-09-23 17:23:27 -07:00
parent 900ce145ad
commit f6d57ef3b0
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/connect.c
View File

@@ -34,6 +34,7 @@ struct connect_task {
iscsi_command_cb cb; iscsi_command_cb cb;
void *private_data; void *private_data;
int lun; int lun;
int num_uas;
}; };
static void static void
@@ -48,14 +49,24 @@ iscsi_testunitready_cb(struct iscsi_context *iscsi, int status,
struct scsi_task *task = command_data; struct scsi_task *task = command_data;
if (status != 0) { if (status != 0) {
if (task->sense.key == SCSI_SENSE_UNIT_ATTENTION if (task->sense.key == SCSI_SENSE_UNIT_ATTENTION) {
&& (task->sense.ascq == SCSI_SENSE_ASCQ_BUS_RESET ||
task->sense.ascq == SCSI_SENSE_ASCQ_POWER_ON_OCCURED ||
task->sense.ascq == SCSI_SENSE_ASCQ_NEXUS_LOSS)) {
/* This is just the normal unitattention/busreset /* This is just the normal unitattention/busreset
* you always get just after a fresh login. Try * you always get just after a fresh login. Try
* again. * again. Instead of enumerating all of them we
* assume that there will be at most 10 or else
* there is something broken.
*/ */
ct->num_uas++;
if (ct->num_uas > 10) {
iscsi_set_error(iscsi, "iscsi_testunitready "
"Too many UnitAttentions "
"during login.");
ct->cb(iscsi, SCSI_STATUS_ERROR, NULL,
ct->private_data);
iscsi_free(iscsi, ct);
scsi_free_scsi_task(task);
return;
}
if (iscsi_testunitready_task(iscsi, ct->lun, if (iscsi_testunitready_task(iscsi, ct->lun,
iscsi_testunitready_cb, iscsi_testunitready_cb,
ct) == NULL) { ct) == NULL) {
@@ -166,6 +177,7 @@ iscsi_full_connect_async(struct iscsi_context *iscsi, const char *portal,
} }
ct->cb = cb; ct->cb = cb;
ct->lun = lun; ct->lun = lun;
ct->num_uas = 0;
ct->private_data = private_data; ct->private_data = private_data;
if (iscsi_connect_async(iscsi, portal, iscsi_connect_cb, ct) != 0) { if (iscsi_connect_async(iscsi, portal, iscsi_connect_cb, ct) != 0) {
iscsi_free(iscsi, ct); iscsi_free(iscsi, ct);