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

socket: Make the pdu timeout handling aware of old iscsi context

Browse Source 
We should check the pdus in old iscsi context when
scanning timeout tasks during reconnecting.

Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
This commit is contained in:
Xie Yongji
2020-06-23 15:37:12 +08:00
parent aad136e5b9
commit ee47dc7338
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/socket.c
View File

@@ -913,7 +913,7 @@ iscsi_tcp_service(struct iscsi_context *iscsi, int revents)
return iscsi_reconnect(iscsi); return iscsi_reconnect(iscsi);
} else { } else {
if (iscsi->old_iscsi) { if (iscsi->old_iscsi) {
return 0; goto check_timeout;
} }
} }
} }
@@ -999,8 +999,14 @@ iscsi_tcp_service(struct iscsi_context *iscsi, int revents)
return iscsi_service_reconnect_if_loggedin(iscsi); return iscsi_service_reconnect_if_loggedin(iscsi);
} }
} }
check_timeout:
iscsi_timeout_scan(iscsi); iscsi_timeout_scan(iscsi);
if (iscsi->old_iscsi) {
iscsi_timeout_scan(iscsi->old_iscsi);
}
return 0; return 0;
} }