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

add iscsi_force_reconnect()

Browse Source 
If a connection attempt is hung, then iscsi_reconnect() won't do anything. This
makes sense if we'd just re-try to connect to the same target, but if (for
example) login redirect might point us to a different, healthy, target, it
should be possible to restart the full connection process on request.

Signed-off-by: John Levon <john.levon@nutanix.com>
This commit is contained in:
John Levon
2022-01-17 11:21:56 +00:00
committed by Bart Van Assche
parent 314aa26576
commit 30dd7c6429
5 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/connect.c
View File

@@ -378,7 +378,7 @@ void iscsi_reconnect_cb(struct iscsi_context *iscsi, int status,
iscsi->pending_reconnect = 0;
}
int iscsi_reconnect(struct iscsi_context *iscsi)
static int reconnect(struct iscsi_context *iscsi, int force)
{
struct iscsi_context *tmp_iscsi;
@@ -397,7 +397,7 @@ int iscsi_reconnect(struct iscsi_context *iscsi)
return 0;
}
if (iscsi->old_iscsi && !iscsi->pending_reconnect) {
if (iscsi->old_iscsi && !iscsi->pending_reconnect && !force) {
return 0;
}
@@ -477,3 +477,13 @@ int iscsi_reconnect(struct iscsi_context *iscsi)
return iscsi_full_connect_async(iscsi, iscsi->portal,
iscsi->lun, iscsi_reconnect_cb, NULL);
}
int iscsi_reconnect(struct iscsi_context *iscsi)
{
return reconnect(iscsi, 0);
}
int iscsi_force_reconnect(struct iscsi_context *iscsi)
{
return reconnect(iscsi, 1);
}

4
lib/libiscsi.def
View File

@@ -2,6 +2,7 @@ LIBRARY libiscsi
EXPORTS
iscsi_connect_async
iscsi_connect_sync
iscsi_force_reconnect_sync
iscsi_reconnect_sync
iscsi_create_context
iscsi_destroy_context
@@ -10,6 +11,7 @@ iscsi_disconnect
iscsi_discovery_async
iscsi_discovery_sync
iscsi_free_discovery_data
iscsi_force_reconnect
iscsi_full_connect_async
iscsi_full_connect_sync
iscsi_get_error
@@ -283,4 +285,4 @@ scsi_task_set_iov_in
scsi_task_set_iov_out
scsi_version_to_str
scsi_version_descriptor_to_str
win32_poll
win32_poll

2
lib/libiscsi.syms.in
View File

@@ -13,6 +13,8 @@ iscsi_discovery_sync
iscsi_extended_copy_sync
iscsi_extended_copy_task
iscsi_free_discovery_data
iscsi_force_reconnect
iscsi_force_reconnect_sync
iscsi_full_connect_async
iscsi_full_connect_sync
iscsi_get_error

16
lib/sync.c
View File

@@ -226,6 +226,22 @@ int iscsi_reconnect_sync(struct iscsi_context *iscsi)
return (state.status == SCSI_STATUS_GOOD) ? 0 : -1;
}
int iscsi_force_reconnect_sync(struct iscsi_context *iscsi)
{
struct iscsi_sync_state state;
memset(&state, 0, sizeof(state));
if (iscsi_force_reconnect(iscsi) != 0) {
iscsi_set_error(iscsi, "Failed to reconnect. %s", iscsi_get_error(iscsi));
return -1;
}
reconnect_event_loop(iscsi, &state);
return (state.status == SCSI_STATUS_GOOD) ? 0 : -1;
}
static void
iscsi_task_mgmt_sync_cb(struct iscsi_context *iscsi, int status,
void *command_data, void *private_data)