From ee47dc73388ac30962e2f5ee1c7ac2b259c0e036 Mon Sep 17 00:00:00 2001 From: Xie Yongji Date: Tue, 23 Jun 2020 15:37:12 +0800 Subject: [PATCH] socket: Make the pdu timeout handling aware of old iscsi context We should check the pdus in old iscsi context when scanning timeout tasks during reconnecting. Signed-off-by: Xie Yongji --- lib/socket.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/socket.c b/lib/socket.c index f7c1b15..dc197ff 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -913,7 +913,7 @@ iscsi_tcp_service(struct iscsi_context *iscsi, int revents) return iscsi_reconnect(iscsi); } else { 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); } } + +check_timeout: iscsi_timeout_scan(iscsi); + if (iscsi->old_iscsi) { + iscsi_timeout_scan(iscsi->old_iscsi); + } + return 0; }