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

Merge pull request #60 from plieven/defer_reconnect

Browse Source 
Fixes for iscsi_set_reconnect_max_retries()
This commit is contained in:
Ronnie Sahlberg
2013-03-11 06:45:29 -07:00
parent 0bc415761a 5a94d5d73a
commit f2e244f10c
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/connect.c
View File

@@ -219,6 +219,12 @@ int iscsi_reconnect(struct iscsi_context *old_iscsi)
{ {
struct iscsi_context *iscsi = old_iscsi; struct iscsi_context *iscsi = old_iscsi;
/* if there is already a deferred reconnect do not try again */
if (iscsi->reconnect_deferred) {
ISCSI_LOG(iscsi, 2, "reconnect initiated, but reconnect is already deferred");
return -1;
}
ISCSI_LOG(iscsi, 2, "reconnect initiated"); ISCSI_LOG(iscsi, 2, "reconnect initiated");
/* This is mainly for tests, where we do not want to automatically /* This is mainly for tests, where we do not want to automatically
@@ -271,6 +277,7 @@ try_again:
if (iscsi_full_connect_sync(iscsi, iscsi->portal, iscsi->lun) != 0) { if (iscsi_full_connect_sync(iscsi, iscsi->portal, iscsi->lun) != 0) {
if (iscsi->reconnect_max_retries != -1 && retry >= iscsi->reconnect_max_retries) { if (iscsi->reconnect_max_retries != -1 && retry >= iscsi->reconnect_max_retries) {
iscsi_defer_reconnect(old_iscsi); iscsi_defer_reconnect(old_iscsi);
iscsi_destroy_context(iscsi);
return -1; return -1;
} }
int backoff=retry; int backoff=retry;