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

pdu: catch rejected packets while target waits for logout

Browse Source 
after a target has send the async target requests logout event it may
reject each request with a waiting for logout reason. Catch these
rejects if an outstanding request and the logout event overlap.

Signed-off-by: Peter Lieven <pl@kamp.de>
This commit is contained in:
Peter Lieven
2014-06-17 14:54:05 +02:00
parent 81921e3762
commit 21e02c2078
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pdu.c
+22 -17
View File
@@ -317,12 +317,25 @@ int iscsi_process_target_nop_in(struct iscsi_context *iscsi,
} }
static void iscsi_reconnect_after_logout(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *opaque _U_)
{
if (status) {
ISCSI_LOG(iscsi, 1, "logout failed: %s", iscsi_get_error(iscsi));
} else {
ISCSI_LOG(iscsi, 2, "logout was successful");
}
iscsi->pending_reconnect = 1;
}
int iscsi_process_reject(struct iscsi_context *iscsi, int iscsi_process_reject(struct iscsi_context *iscsi,
struct iscsi_in_pdu *in) struct iscsi_in_pdu *in)
{ {
int size = in->data_pos; int size = in->data_pos;
uint32_t itt; uint32_t itt;
struct iscsi_pdu *pdu; struct iscsi_pdu *pdu;
uint8_t reason = in->hdr[2];
if (size < ISCSI_RAW_HEADER_SIZE) { if (size < ISCSI_RAW_HEADER_SIZE) {
iscsi_set_error(iscsi, "size of REJECT payload is too small." iscsi_set_error(iscsi, "size of REJECT payload is too small."
@@ -331,6 +344,14 @@ int iscsi_process_reject(struct iscsi_context *iscsi,
return -1; return -1;
} }
if (reason == ISCSI_REJECT_WAITING_FOR_LOGOUT) {
ISCSI_LOG(iscsi, 1, "target rejects request with reason: %s", iscsi_reject_reason_str(reason));
iscsi_logout_async_internal(iscsi, iscsi_reconnect_after_logout, NULL, ISCSI_PDU_DROP_ON_RECONNECT|ISCSI_PDU_URGENT_DELIVERY);
return 0;
}
iscsi_set_error(iscsi, "Request was rejected with reason: 0x%02x (%s)", reason, iscsi_reject_reason_str(reason));
itt = scsi_get_uint32(&in->data[16]); itt = scsi_get_uint32(&in->data[16]);
if (iscsi->log_level > 1) { if (iscsi->log_level > 1) {
@@ -359,17 +380,6 @@ int iscsi_process_reject(struct iscsi_context *iscsi,
} }
static void iscsi_reconnect_after_logout(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *opaque _U_)
{
if (status) {
ISCSI_LOG(iscsi, 1, "logout failed: %s", iscsi_get_error(iscsi));
} else {
ISCSI_LOG(iscsi, 2, "logout was successful");
}
iscsi->pending_reconnect = 1;
}
int int
iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in) iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
{ {
@@ -404,12 +414,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
} }
if (opcode == ISCSI_PDU_REJECT) { if (opcode == ISCSI_PDU_REJECT) {
iscsi_set_error(iscsi, "Request was rejected with reason: 0x%02x (%s)", in->hdr[2], iscsi_reject_reason_str(in->hdr[2])); return iscsi_process_reject(iscsi, in);
if (iscsi_process_reject(iscsi, in) != 0) {
return -1;
}
return 0;
} }
if (opcode == ISCSI_PDU_NOP_IN && itt == 0xffffffff) { if (opcode == ISCSI_PDU_NOP_IN && itt == 0xffffffff) {